From 2cd519fb71e10ef163653c3e8c04617849053257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Mon, 14 Oct 2013 15:03:58 +0200
Subject: [PATCH] MDL-42152 fix broken theme->yuicssmodules support

---
 lib/outputrequirementslib.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
index 554b767b522..bd64f0599f4 100644
--- a/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@ -1261,17 +1261,16 @@ class page_requirements_manager {
 
         if ($this->yui3loader->combine) {
             if (!empty($page->theme->yuicssmodules)) {
-                $code .= '<script type="text/javascript" src="'.$this->yui3loader->local_comboBase
-                        . implode('&amp;', $baserollups) . '"></script>';
-                $code .= '<script type="text/javascript" src="'.$this->yui3loader->local_comboBase
-                        . implode('&amp;', $moodlerollups) . '"></script>';
-
                 $modules = array();
                 foreach ($page->theme->yuicssmodules as $module) {
                     $modules[] = "$CFG->yui3version/$module/$module-min.css";
                 }
                 $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->comboBase.implode('&amp;', $modules).'" />';
             }
+            $code .= '<script type="text/javascript" src="'.$this->yui3loader->local_comboBase
+                    . implode('&amp;', $baserollups) . '"></script>';
+            $code .= '<script type="text/javascript" src="'.$this->yui3loader->local_comboBase
+                    . implode('&amp;', $moodlerollups) . '"></script>';
 
         } else {
             if (!empty($page->theme->yuicssmodules)) {
@@ -1294,7 +1293,6 @@ class page_requirements_manager {
             $code = str_replace('-min.css', '.css', $code);
             $code = str_replace('-min.js', '-debug.js', $code);
         }
-
         return $code;
     }