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

2012-05-07 13:03:57 +08:00
parent 9d669d60bd 3dde1fcafb
commit e71b8ccbd1
1 changed files with 4 additions and 0 deletions
@@ -1306,6 +1306,7 @@ class moodle_page {
                    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 @@ class moodle_page {
                            }
                        }
                    }
+                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 @@ class moodle_page {
                            return $USER->theme;
                        }
                    }
+                break;

                case 'site':
                    if ($mnetpeertheme) {