Merge branch 'MDL-32684_M21' of git://github.com/lazydaisy/moodle int…

…o MOODLE_21_STABLE
rezeau · May 7, 2012 · 427ef2e · 427ef2e
2 parents 68a2b1f + 53f2606
commit 427ef2e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/pagelib.php b/lib/pagelib.php
@@ -1304,6 +1304,7 @@ protected function resolve_theme() {
                     if (!empty($CFG->allowcoursethemes) && !empty($this->_course->theme) && $this->devicetypeinuse == 'default') {
                         return $this->_course->theme;
                     }
+                break;
 
                 case 'category':
                     if (!empty($CFG->allowcategorythemes) && $this->devicetypeinuse == 'default') {
@@ -1314,11 +1315,13 @@ protected function resolve_theme() {
                             }
                         }
                     }
+                break;
 
                 case 'session':
                     if (!empty($SESSION->theme)) {
                         return $SESSION->theme;
                     }
+                break;
 
                 case 'user':
                     if (!empty($CFG->allowuserthemes) && !empty($USER->theme) && $this->devicetypeinuse == 'default') {
@@ -1328,6 +1331,7 @@ protected function resolve_theme() {
                             return $USER->theme;
                         }
                     }
+                break;
 
                 case 'site':
                     if ($mnetpeertheme) {