Merge branch 'MDL-51576-master-2' of git://github.com/ryanwyllie/moodle

abgreeve · Oct 13, 2015 · 08d9393 · 08d9393
2 parents ab848fe + 4b59672
commit 08d9393
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/navigationlib.php b/lib/navigationlib.php
@@ -3928,6 +3928,10 @@ protected function load_course_settings($forceopen = false) {
         // Let plugins hook into course navigation.
         $pluginsfunction = get_plugins_with_function('extend_navigation_course', 'lib.php');
         foreach ($pluginsfunction as $plugintype => $plugins) {
+            // Ignore the report plugin as it was already loaded above.
+            if ($plugintype == 'report') {
+                continue;
+            }
             foreach ($plugins as $pluginfunction) {
                 $pluginfunction($coursenode, $course, $coursecontext);
             }