mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-12 03:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-39326-m25' of git://github.com/samhemelryk/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2013-04-24 12:53:16 +08:00
commit a6e22a88c7
1 changed files with 10 additions and 3 deletions

13
theme/styles.php

@ -134,7 +134,6 @@ if ($type === 'editor') {
css_store_css($theme, $candidatesheet, $cssfiles);
} else {
// IE requests plugins/parents/theme instead of all at once.
$chunk = in_array($type, array('plugins', 'parents', 'theme'));
$basedir = "$CFG->cachedir/theme/$themename/css";
if (!$usesvg) {
$basedir .= '/nosvg';
@ -144,9 +143,17 @@ if ($type === 'editor') {
$relroot = preg_replace('|^http.?://[^/]+|', '', $CFG->wwwroot);
foreach ($css as $key=>$value) {
if (!empty($slashargument)) {
$chunkurl = "{$relroot}/theme/styles.php/{$themename}/{$rev}/{$key}";
if ($usesvg) {
$chunkurl = "{$relroot}/theme/styles.php/{$themename}/{$rev}/{$key}";
} else {
$chunkurl = "{$relroot}/theme/styles.php/_s/{$themename}/{$rev}/{$key}";
}
} else {
$chunkurl = "{$relroot}/theme/styles.php?theme={$themename}&rev={$rev}&type={$key}";
if ($usesvg) {
$chunkurl = "{$relroot}/theme/styles.php?theme={$themename}&rev={$rev}&type={$key}";
} else {
$chunkurl = "{$relroot}/theme/styles.php?theme={$themename}&rev={$rev}&type={$key}&svg=0";
}
}
$cssfiles = array();
foreach($value as $val) {