Permalink
Browse files

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

…o MOODLE_21_STABLE
  • Loading branch information...
2 parents 68a2b1f + 53f2606 commit 427ef2ef69b7e4db472d939549c317204f9af79e @danpoltawski danpoltawski committed May 7, 2012
Showing with 4 additions and 0 deletions.
  1. +4 −0 lib/pagelib.php
View
@@ -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) {

0 comments on commit 427ef2e

Please sign in to comment.