From 42dcfffc4f7b240f377c9a03e10bb9dee0c96682 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Wed, 25 Nov 2015 13:03:25 +0800 Subject: [PATCH] MDL-52160 navigation: Mark category and module settings nodes as branch --- lib/navigationlib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/navigationlib.php b/lib/navigationlib.php index ee029fe1d3e..8bc4a917de1 100644 --- a/lib/navigationlib.php +++ b/lib/navigationlib.php @@ -3971,6 +3971,7 @@ class settings_navigation extends navigation_node { } $modulenode = $this->add(get_string('pluginadministration', $this->page->activityname), null, self::TYPE_SETTING, null, 'modulesettings'); + $modulenode->nodetype = navigation_node::NODETYPE_BRANCH; $modulenode->force_open(); // Settings for the module @@ -4026,12 +4027,10 @@ class settings_navigation extends navigation_node { } $function = $this->page->activityname.'_extend_settings_navigation'; - if (!function_exists($function)) { - return $modulenode; + if (function_exists($function)) { + $function($this, $modulenode); } - $function($this, $modulenode); - // Remove the module node if there are no children. if ($modulenode->children->count() <= 0) { $modulenode->remove(); @@ -4572,6 +4571,7 @@ class settings_navigation extends navigation_node { } $categorynode = $this->add($catcontext->get_context_name(), null, null, null, 'categorysettings'); + $categorynode->nodetype = navigation_node::NODETYPE_BRANCH; $categorynode->force_open(); if (can_edit_in_category($catcontext->instanceid)) { -- 2.36.1