Merge branch 'MDL-50271-28' of git://github.com/jleyva/moodle into MO…

…ODLE_28_STABLE
moodle · May 26, 2015 · d88c343 · d88c343
2 parents 8ff5016 + caf3cb7
commit d88c343
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/pagelib.php b/lib/pagelib.php
@@ -1828,6 +1828,11 @@ protected function ensure_categories_loaded() {
      * @throws coding_exception
      */
     protected function ensure_theme_not_set() {
+        // This is explicitly allowed for webservices though which may process many course contexts in a single request.
+        if (WS_SERVER) {
+            return;
+        }
+
         if (!is_null($this->_theme)) {
             throw new coding_exception('The theme has already been set up for this page ready for output. ' .
                     'Therefore, you can no longer change the theme, or anything that might affect what ' .