MDL-60815 theme: fix loading editor styles

This commit is contained in:
Ryan Wyllie
2018-01-16 03:39:09 +00:00
parent f5b956679e
commit bb8bb8e41c
3 changed files with 33 additions and 7 deletions
+3 -7
View File
@@ -69,11 +69,7 @@ $values = explode('_', $rev);
$rev = min_clean_param(array_shift($values), 'INT');
$themesubrev = array_shift($values);
if (is_null($themesubrev)) {
// Default to the current theme subrevision if one isn't
// provided in the URL.
$themesubrev = theme_get_sub_revision_for_theme($themename);
} else {
if (!is_null($themesubrev)) {
$themesubrev = min_clean_param($themesubrev, 'INT');
}
@@ -144,12 +140,12 @@ make_localcache_directory('theme', false);
if ($type === 'editor') {
$csscontent = $theme->get_css_content_editor();
css_store_css($theme, $candidatesheet, $csscontent, false);
if ($cache) {
css_store_css($theme, $candidatesheet, $csscontent, false);
css_send_cached_css($candidatesheet, $etag);
} else {
css_send_uncached_css(file_get_contents($candidatesheet));
css_send_uncached_css($csscontent);
}
}