Merge "Bug 1607743 Fix page theme comflicting with configuarable theme"

htdocs/lib/web.php

@@ -82,7 +82,10 @@ function get_stylesheets_for_current_page($stylesheets, $extraconfig) {
             }
         }
     }
-    if ($sheets = $THEME->additional_stylesheets()) {
+
+    // Only add additional stylesheets when configurable theme is set.
+    if ($THEME->basename == 'custom') {
+        $sheets = $THEME->additional_stylesheets();
         $stylesheets = array_merge($stylesheets, $sheets);
     }