MDL-31043 allow themes to set custommenu instead of using global sett…

…ings
moodle · Jan 5, 2012 · 0f6d934 · 0f6d934
1 parent 0e84b16
commit 0f6d934
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
@@ -2433,14 +2433,18 @@ public function larrow() {
      *    Settings: Administration > Appearance > Themes > Theme settings
      * and then configuring the custommenu config setting as described.
      *
+     * @param string $custommenuitems - custom menuitems set by theme instead of global theme settings
      * @return string
      */
-    public function custom_menu() {
+    public function custom_menu($custommenuitems = '') {
         global $CFG;
-        if (empty($CFG->custommenuitems)) {
+        if (empty($custommenuitems) && !empty($CFG->custommenuitems)) {
+            $custommenuitems = $CFG->custommenuitems;
+        }
+        if (empty($custommenuitems)) {
             return '';
         }
-        $custommenu = new custom_menu($CFG->custommenuitems, current_language());
+        $custommenu = new custom_menu($custommenuitems, current_language());
         return $this->render_custom_menu($custommenu);
     }