Commit 8fa4c8b9 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

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

parents ed64359b 961ae544
......@@ -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);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment