L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master_MDL-31043' of git://github.com/danmarsden/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2012-01-09 12:23:11 +13:00
parent 94d59c9b23 0f6d934941
commit df121fb287
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/outputrenderers.php
+7 -3
View File
@@ -2433,14 +2433,18 @@ EOD;
* 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);
}