MDL-31242 Prevent redefinition of MOODLE_INTERNAL when loading multip…

…le YUI modules from Moodle
moodle · Jan 18, 2012 · c1e6056 · c1e6056
1 parent 4e7397d
commit c1e6056
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/theme/yui_combo.php b/theme/yui_combo.php
@@ -74,8 +74,10 @@
     $version = array_shift($bits);
     if ($version == 'moodle') {
         //TODO: this is a ugly hack because we should not load any libs here!
-        define('MOODLE_INTERNAL', true);
-        require_once($CFG->libdir.'/moodlelib.php');
+        if (!defined('MOODLE_INTERNAL')) {
+            define('MOODLE_INTERNAL', true);
+            require_once($CFG->libdir.'/moodlelib.php');
+        }
         $revision = (int)array_shift($bits);
         if ($revision === -1) {
             // Revision -1 says please don't cache the JS