Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
moodle
moodle
Commits
74a088bc
Commit
74a088bc
authored
Jan 13, 2016
by
Dan Poltawski
Browse files
Merge branch 'MDL-49662_master' of
git://github.com/markn86/moodle
parents
51443a21
a0ac16cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/navigationlib.php
View file @
74a088bc
...
...
@@ -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
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment