Permalink
Browse files

MDL-39673 css: no passed the no svg key to chunking when required

Cherry-picked from MDL-39326
  • Loading branch information...
1 parent 713b818 commit f8e60e04b9a149d85b8a8f89882cd17d974dec16 Sam Hemelryk committed with damyon Apr 24, 2013
Showing with 10 additions and 2 deletions.
  1. +10 −2 theme/styles.php
View
@@ -144,9 +144,17 @@
$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) {

0 comments on commit f8e60e0

Please sign in to comment.