MDL-45507 theme_bootstrapbase: Fix regression for theme based custom menu

in renderers/core_renderer.php.
This commit is contained in:
Mary Evans 2014-06-08 23:51:33 +01:00 committed by Sam Hemelryk
parent f7adf8a010
commit dc22f74419

View file

@ -78,8 +78,8 @@ class theme_bootstrapbase_core_renderer extends core_renderer {
public function custom_menu($custommenuitems = '') {
global $CFG;
if (!empty($CFG->custommenuitems)) {
$custommenuitems .= $CFG->custommenuitems;
if (empty($custommenuitems) && !empty($CFG->custommenuitems)) {
$custommenuitems = $CFG->custommenuitems;
}
$custommenu = new custom_menu($custommenuitems, current_language());
return $this->render_custom_menu($custommenu);