MDL-71915 mod_url: Update for tertiary nav

Remove the headings if the secondary nav is present in this activity.
jbs1 · Dec 6, 2021 · 45621b7 · 45621b7
1 parent 6dfb487
commit 45621b7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/mod/url/index.php b/mod/url/index.php
@@ -50,7 +50,9 @@
 $PAGE->set_heading($course->fullname);
 $PAGE->navbar->add($strurls);
 echo $OUTPUT->header();
-echo $OUTPUT->heading($strurls);
+if (!$PAGE->has_secondary_navigation()) {
+    echo $OUTPUT->heading($strurls);
+}
 
 if (!$urls = get_all_instances_in_course('url', $course)) {
     notice(get_string('thereareno', 'moodle', $strurls), "$CFG->wwwroot/course/view.php?id=$course->id");

diff --git a/mod/url/locallib.php b/mod/url/locallib.php
@@ -266,10 +266,13 @@ function url_display_frame($url, $cm, $course) {
  * @return does not return
  */
 function url_print_workaround($url, $cm, $course) {
-    global $OUTPUT, $USER;
+    global $OUTPUT, $PAGE, $USER;
 
     url_print_header($url, $cm, $course);
-    url_print_heading($url, $cm, $course, true);
+
+    if (!$PAGE->has_secondary_navigation()) {
+        url_print_heading($url, $cm, $course, true);
+    }
 
     // Display any activity information (eg completion requirements / dates).
     $cminfo = cm_info::create($cm);
@@ -344,7 +347,9 @@ function url_display_embed($url, $cm, $course) {
     }
 
     url_print_header($url, $cm, $course);
-    url_print_heading($url, $cm, $course);
+    if (!$PAGE->has_secondary_navigation()) {
+        url_print_heading($url, $cm, $course);
+    }
 
     // Display any activity information (eg completion requirements / dates).
     $cminfo = cm_info::create($cm);

diff --git a/mod/url/view.php b/mod/url/view.php
@@ -58,7 +58,9 @@
 $exturl = trim($url->externalurl);
 if (empty($exturl) or $exturl === 'http://') {
     url_print_header($url, $cm, $course);
-    url_print_heading($url, $cm, $course);
+    if (!$PAGE->has_secondary_navigation()) {
+        url_print_heading($url, $cm, $course);
+    }
     url_print_intro($url, $cm, $course);
     notice(get_string('invalidstoredurl', 'url'), new moodle_url('/course/view.php', array('id'=>$cm->course)));
     die;