Merge branch 'MDL-72481-master' of https://github.com/rezaies/moodle

admin/search.php

@@ -11,6 +11,7 @@
 
 $context = context_system::instance();
 $PAGE->set_context($context);
+$PAGE->set_secondary_navigation(true, true);
 
 $hassiteconfig = has_capability('moodle/site:config', $context);
 
@@ -91,7 +92,7 @@
     if ($node) {
         $secondarynavigation = false;
         if ($PAGE->has_secondary_navigation()) {
-            $moremenu = new \core\navigation\output\more_menu($PAGE->secondarynav, 'nav-tabs');
+            $moremenu = new \core\navigation\output\more_menu($PAGE->secondarynav, 'nav-tabs', true, true);
             $secondarynavigation = $moremenu->export_for_template($OUTPUT);
         }
         echo $OUTPUT->render_from_template('core/settings_link_page',

admin/tool/componentlibrary/docspage.php

@@ -76,7 +76,7 @@
 $PAGE->requires->css($cssfile);
 $jsonfile = new moodle_url('/admin/tool/componentlibrary/hugo/site/data/my-index.json');
 $PAGE->requires->js_call_amd('tool_componentlibrary/loader', 'init', ['jsonfile' => $jsonfile->out()]);
-$PAGE->has_secondary_navigation_setter(false);
+$PAGE->set_secondary_navigation(false);
 
 if (get_config('core', 'allowthemechangeonurl')) {
     $themes = core_component::get_plugin_list('theme');

error/index.php

@@ -36,7 +36,7 @@
 $PAGE->set_title($title);
 $PAGE->set_heading($title);
 $PAGE->navbar->add($title);
-$PAGE->has_secondary_navigation_setter(false);
+$PAGE->set_secondary_navigation(false);
 
 // This allows the webserver to dictate wether the http status should remain
 // what it would have been, or force it to be a 404. Under other conditions

index.php

@@ -103,10 +103,10 @@
 $PAGE->set_title($SITE->fullname);
 $PAGE->set_heading($SITE->fullname);
 if (has_capability('moodle/course:update', context_system::instance())) {
-    $PAGE->has_secondary_navigation_setter(true);
+    $PAGE->set_secondary_navigation(true);
     $PAGE->set_secondary_active_tab('coursehome');
 } else {
-    $PAGE->has_secondary_navigation_setter(false);
+    $PAGE->set_secondary_navigation(false);
 }
 
 $courserenderer = $PAGE->get_renderer('core', 'course');