From 55834476c45507721f8333224bb003a5dcfdc103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mudr=C3=A1k?= <david@moodle.com>
Date: Thu, 24 Jan 2013 18:39:24 +0100
Subject: [PATCH] MDL-37598 Proceed full setup in YUI serving files if needed

When serving Moodle YUI files, including just moodlelib.php is not enough
any more. We need the full setup in order to use MUC.

Please note that cookies are disabled in these two scripts. This may make
cache_store::MODE_SESSION caches unavailable. We do not expect they will
be needed here.
---
 theme/yui_combo.php | 9 +++++----
 theme/yui_image.php | 9 ++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/theme/yui_combo.php b/theme/yui_combo.php
index bd19b5039cc..f7912ba9040 100644
--- a/theme/yui_combo.php
+++ b/theme/yui_combo.php
@@ -82,10 +82,11 @@ foreach ($parts as $part) {
     //debug($bits);
     $version = array_shift($bits);
     if ($version === 'moodle') {
-        //TODO: this is a ugly hack because we should not load any libs here!
-        if (!defined('MOODLE_INTERNAL')) {
-            define('MOODLE_INTERNAL', true);
-            require_once($CFG->libdir.'/moodlelib.php');
+        if (!defined('ABORT_AFTER_CONFIG_CANCEL')) {
+            define('ABORT_AFTER_CONFIG_CANCEL', true);
+            define('NO_UPGRADE_CHECK', true);
+            define('NO_MOODLE_COOKIES', true);
+            require($CFG->libdir.'/setup.php');
         }
         $revision = (int)array_shift($bits);
         if ($revision === -1) {
diff --git a/theme/yui_image.php b/theme/yui_image.php
index 4477a9c36c0..3787f0186a5 100644
--- a/theme/yui_image.php
+++ b/theme/yui_image.php
@@ -43,9 +43,12 @@ $parts = explode('/', $path);
 $version = array_shift($parts);
 
 if ($version == 'moodle' && count($parts) >= 3) {
-    //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('ABORT_AFTER_CONFIG_CANCEL')) {
+        define('ABORT_AFTER_CONFIG_CANCEL', true);
+        define('NO_UPGRADE_CHECK', true);
+        define('NO_MOODLE_COOKIES', true);
+        require($CFG->libdir.'/setup.php');
+    }
     $frankenstyle = array_shift($parts);
     $module = array_shift($parts);
     $image = array_pop($parts);