Skip to content
Browse files

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

…o MOODLE_22_STABLE
  • Loading branch information...
2 parents 9d669d6 + 3dde1fc commit e71b8ccbd19ef24a799b47c753f946d73184b729 @danpoltawski danpoltawski committed May 7, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 lib/pagelib.php
View
4 lib/pagelib.php
@@ -1306,6 +1306,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') {
@@ -1316,11 +1317,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') {
@@ -1330,6 +1333,7 @@ protected function resolve_theme() {
return $USER->theme;
}
}
+ break;
case 'site':
if ($mnetpeertheme) {

0 comments on commit e71b8cc

Please sign in to comment.
Something went wrong with that request. Please try again.