From 2ad68b8c955654b2a1fa7c9dc8d34d71c2cb02ba Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Wed, 13 Feb 2013 14:47:24 +1300
Subject: [PATCH] MDL-38000 css: fixed handling of CSS files by outputlib.

---
 lib/outputlib.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/outputlib.php b/lib/outputlib.php
index dcd08758fb7..e9829583ff7 100644
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -823,10 +823,12 @@ class theme_config {
     protected function css_files_get_contents($file, array $keys, css_optimiser $optimiser = null) {
         global $CFG;
         if (is_array($file)) {
+            // We use a separate array to keep everything in the exact same order.
+            $return = array();
             foreach ($file as $key=>$f) {
-                $file[$key] = $this->css_files_get_contents($f, array_merge($keys, array($key)), $optimiser);
+                $return[clean_param($key, PARAM_SAFEDIR)] = $this->css_files_get_contents($f, array_merge($keys, array($key)), $optimiser);
             }
-            return $file;
+            return $return;
         } else {
             $contents = file_get_contents($file);
             $contents = $this->post_process($contents);
@@ -914,7 +916,6 @@ class theme_config {
                 }
             }
         }
-
         return $js;
     }