mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 14:03:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-49662_master' of git://github.com/markn86/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-01-13 11:40:49 +00:00
commit 74a088bc82
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/navigationlib.php
View File

@ -1296,18 +1296,8 @@ class global_navigation extends navigation_node {
}
// Give the local plugins a chance to include some navigation if they want.
foreach (core_component::get_plugin_list_with_file('local', 'lib.php', true) as $plugin => $unused) {
$function = "local_{$plugin}_extend_navigation";
$oldfunction = "local_{$plugin}_extends_navigation";
if (function_exists($function)) {
$function($this);
} else if (function_exists($oldfunction)) {
debugging("Deprecated local plugin navigation callback: Please rename '{$oldfunction}' to '{$function}'. ".
"Support for the old callback will be dropped in Moodle 3.1", DEBUG_DEVELOPER);
$oldfunction($this);
}
foreach (get_plugin_list_with_function('local', 'extend_navigation') as $function) {
$function($this);
}
// Remove any empty root nodes
@ -4830,18 +4820,8 @@ class settings_navigation extends navigation_node {
*/
protected function load_local_plugin_settings() {
foreach (core_component::get_plugin_list_with_file('local', 'lib.php', true) as $plugin => $unused) {
$function = "local_{$plugin}_extend_settings_navigation";
$oldfunction = "local_{$plugin}_extends_settings_navigation";
if (function_exists($function)) {
$function($this, $this->context);
} else if (function_exists($oldfunction)) {
debugging("Deprecated local plugin navigation callback: Please rename '{$oldfunction}' to '{$function}'. ".
"Support for the old callback will be dropped in Moodle 3.1", DEBUG_DEVELOPER);
$oldfunction($this, $this->context);
}
foreach (get_plugin_list_with_function('local', 'extend_settings_navigation') as $function) {
$function($this, $this->context);
}
}