Move switch check to top level so that switch is always respected

guardian · May 21, 2024 · 7d0888a · 7d0888a
1 parent 3e9c079
commit 7d0888a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/common/app/views/support/HtmlCleaner.scala b/common/app/views/support/HtmlCleaner.scala
@@ -941,11 +941,11 @@ object AffiliateLinksCleaner {
   ): Boolean = {
 
     // Never include affiliate links if it is tagged with an always off tag
-    if (!contentHasAlwaysOffTag(tagPaths, alwaysOffTags)) {
+    if (!contentHasAlwaysOffTag(tagPaths, alwaysOffTags) && switchedOn) {
       if (showAffiliateLinks.isDefined) {
         showAffiliateLinks.contains(true)
       } else {
-        switchedOn && supportedSections.contains(section) && !tagPaths.exists(path => defaultOffTags.contains(path))
+        supportedSections.contains(section) && !tagPaths.exists(path => defaultOffTags.contains(path))
       }
     } else false
   }