mod-page MDL-19799 Updated print_header_simple and build_navigation to OUTPUT and...

diff --git a/mod/page/index.php b/mod/page/index.php
index 081c9a8c31cedb5bf9ea038efdfc0b43f6fe4705..dda366d5b6b228b2b84a1e758e52d7e21dca982b 100644 (file)
--- a/mod/page/index.php
+++ b/mod/page/index.php
@@ -44,8 +44,8 @@ $strlastmodified = get_string('lastmodified');
 $PAGE->set_url('mod/page/index.php', array('id' => $course->id));
 $PAGE->set_title($course->shortname.': '.$strpages);
 $PAGE->set_heading($course->fullname);
-$navlinks = array(array('name' => $strpages, 'link' => '', 'type' => 'activityinstance'));
-echo $OUTPUT->header(build_navigation($navlinks), navmenu($course));
+$PAGE->navbar->add($strpages);
+echo $OUTPUT->header();
 
 if (!$pages = get_all_instances_in_course('page', $course)) {
     notice(get_string('thereareno', 'moodle', $strpages), "$CFG->wwwroot/course/view.php?id=$course->id");

diff --git a/mod/page/view.php b/mod/page/view.php
index bd23036c68a9f12f27fc0bb913e9cf601c9611c9..6dc7e117bf78c8bc8858570a75dcd8a6990a8d87 100644 (file)
--- a/mod/page/view.php
+++ b/mod/page/view.php
@@ -71,7 +71,7 @@ if ($inpopup and $page->display == RESOURCELIB_DISPLAY_POPUP) {
     $PAGE->set_heading($course->fullname);
     $PAGE->set_activity_record($page);
     $PAGE->set_button(update_module_button($cm->id, '', get_string('modulename', 'page')));
-    echo $OUTPUT->header(build_navigation('', $cm), navmenu($course, $cm));
+    echo $OUTPUT->header();
 
     if (!empty($options['printheading'])) {
         echo $OUTPUT->heading(format_string($page->name), 2, 'main', 'pageheading');