Merge branch 'MDL-50125_master' of git://github.com/dmonllao/moodle

This commit is contained in:
Dan Poltawski 2015-07-27 12:21:33 +01:00
commit 14f438c531

View File

@ -3915,10 +3915,12 @@ class settings_navigation extends navigation_node {
}
}
// Let admin tools hook into course navigation.
$tools = get_plugin_list_with_function('tool', 'extend_navigation_course', 'lib.php');
foreach ($tools as $toolfunction) {
$toolfunction($coursenode, $course, $coursecontext);
// Let plugins hook into course navigation.
$pluginsfunction = get_plugins_with_function('extend_navigation_course', 'lib.php');
foreach ($pluginsfunction as $plugintype => $plugins) {
foreach ($plugins as $pluginfunction) {
$pluginfunction($coursenode, $course, $coursecontext);
}
}
// Return we are done
@ -4484,10 +4486,12 @@ class settings_navigation extends navigation_node {
}
}
// Let admin tools hook into user settings navigation.
$tools = get_plugin_list_with_function('tool', 'extend_navigation_user_settings', 'lib.php');
foreach ($tools as $toolfunction) {
$toolfunction($usersetting, $user, $usercontext, $course, $coursecontext);
// Let plugins hook into user settings navigation.
$pluginsfunction = get_plugins_with_function('extend_navigation_user_settings', 'lib.php');
foreach ($pluginsfunction as $plugintype => $plugins) {
foreach ($plugins as $pluginfunction) {
$pluginfunction($usersetting, $user, $usercontext, $course, $coursecontext);
}
}
return $usersetting;
@ -4717,10 +4721,12 @@ class settings_navigation extends navigation_node {
$frontpage->add(get_string('sitelegacyfiles'), $url, self::TYPE_SETTING, null, null, new pix_icon('i/folder', ''));
}
// Let admin tools hook into frontpage navigation.
$tools = get_plugin_list_with_function('tool', 'extend_navigation_frontpage', 'lib.php');
foreach ($tools as $toolfunction) {
$toolfunction($frontpage, $course, $coursecontext);
// Let plugins hook into frontpage navigation.
$pluginsfunction = get_plugins_with_function('extend_navigation_frontpage', 'lib.php');
foreach ($pluginsfunction as $plugintype => $plugins) {
foreach ($plugins as $pluginfunction) {
$pluginfunction($frontpage, $course, $coursecontext);
}
}
return $frontpage;