From e640790eb656654e09915f9096b25398b0dbad85 Mon Sep 17 00:00:00 2001
From: nicolasconnault <nicolasconnault>
Date: Mon, 7 Sep 2009 10:01:26 +0000
Subject: [PATCH] MDL-19792 Applied Sam's patch
---
blog/edit.php | 22 +++++++---------------
blog/external.php | 11 ++++-------
blog/header.php | 6 ------
blog/lib.php | 2 +-
blog/preferences.php | 7 +++----
5 files changed, 15 insertions(+), 33 deletions(-)
diff --git a/blog/edit.php b/blog/edit.php
index 6b37aa5ec8..af16198fd5 100755
--- a/blog/edit.php
+++ b/blog/edit.php
@@ -82,7 +82,7 @@ if (!empty($courseid) && empty($modid)) {
// If a modid is given, guess courseid
if (!empty($modid)) {
$returnurl->param('modid', $modid);
- $courseid = $DB->get_field('course_modules', 'course', array('id' => $modid));
+ $courseid = $DB->get_field('course_modules', 'course', array('id' => $modid));
$returnurl->param('courseid', $courseid);
$PAGE->set_context(get_context_instance(CONTEXT_MODULE, $modid));
}
@@ -99,7 +99,9 @@ if ($action === 'delete'){
} else {
$optionsyes = array('id'=>$id, 'action'=>'delete', 'confirm'=>1, 'sesskey'=>sesskey(), 'courseid'=>$courseid);
$optionsno = array('userid'=>$existing->userid, 'courseid'=>$courseid);
- print_header("$SITE->shortname: $strblogs", $SITE->fullname);
+ $PAGE->set_title("$SITE->shortname: $strblogs");
+ $PAGE->set_heading($SITE->fullname);
+ echo $OUTPUT->header();
//blog_print_entry($existing);
$existing->print_html();
echo '<br />';
@@ -226,19 +228,9 @@ if (!$user = $DB->get_record('user', array('id'=>$userid))) {
$blog_headers = blog_get_headers();
-$navigation = build_navigation($blog_headers['navlinks'], $blog_headers['cm']);
-/*
-$navlinks = array();
-$navlinks[] = array('name' => fullname($user), 'link' => "$CFG->wwwroot/user/view.php?id=$userid", 'type' => 'misc');
-$navlinks[] = array('name' => $strblogs, 'link' => "$CFG->wwwroot/blog/index.php?userid=$userid", 'type' => 'misc');
-$navlinks[] = array('name' => $strformheading, 'link' => null, 'type' => 'misc');
-$navigation = build_navigation($navlinks);
-*/
-$PAGE->requires->js('blog/edit_form.js');
-$PAGE->set_title($blog_headers['title']);
-$PAGE->set_heading($blog_headers['title']);
-
-echo $OUTPUT->header($navigation);
+$PAGE->requires->js('blog/edit_form.js');
+
+echo $OUTPUT->header();
$blogeditform->set_data($entry);
$blogeditform->display();
diff --git a/blog/external.php b/blog/external.php
index e5cc9e7ae1..6e0a9c845a 100644
--- a/blog/external.php
+++ b/blog/external.php
@@ -113,16 +113,13 @@ if ($externalblogform->is_cancelled()){
redirect($returnurl);
}
-$navlinks = array();
-$navlinks[] = array('name' => fullname($user), 'link' => "$CFG->wwwroot/user/view.php?id=$user->id", 'type' => 'misc');
-$navlinks[] = array('name' => $strblogs, 'link' => "$CFG->wwwroot/blog/index.php?userid=$user->id", 'type' => 'misc');
-$navlinks[] = array('name' => $strformheading, 'link' => null, 'type' => 'misc');
-$navigation = build_navigation($navlinks);
-
+$PAGE->navbar->add(fullname($user), new moodle_url($CFG->wwwroot.'/user/view.php', array('id'=>$user->id)));
+$PAGE->navbar->add($strblogs, new moodle_url($CFG->wwwroot.'/blog/index.php', array('userid'=>$user->id)));
+$PAGE->navbar->add($strformheading);
$PAGE->set_heading("$SITE->shortname: $strblogs: $strexternalblogs", $SITE->fullname);
$PAGE->set_title("$SITE->shortname: $strblogs: $strexternalblogs");
-echo $OUTPUT->header($navigation);
+echo $OUTPUT->header();
echo $OUTPUT->heading($strformheading, 2);
$external->returnurl = $returnurl;
diff --git a/blog/header.php b/blog/header.php
index 0c14c6703a..0823407a95 100755
--- a/blog/header.php
+++ b/blog/header.php
@@ -99,12 +99,6 @@ if (!empty($search_link)) {
$blog_headers = blog_get_headers();
-if (isset($cm)) {
- $navigation = build_navigation($blog_headers['navlinks'], $cm);
-} else {
- $navigation = build_navigation($blog_headers['navlinks']);
-}
-
// prints the tabs
$showroles = !empty($userid);
$currenttab = 'blogs';
diff --git a/blog/lib.php b/blog/lib.php
index 0ff3436a83..4b51b721b2 100755
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -518,7 +518,7 @@ function blog_get_headers() {
$action = optional_param('action', null, PARAM_ALPHA);
$confirm = optional_param('confirm', false, PARAM_BOOL);
- $headers = array('navlinks' => array(), 'title' => '', 'heading' => '', 'cm' => null);
+ $headers = array('title' => '', 'heading' => '', 'cm' => null);
$blog_url = new moodle_url($CFG->wwwroot . '/blog/index.php');
$site = $DB->get_record('course', array('id' => SITEID));
diff --git a/blog/preferences.php b/blog/preferences.php
index e5e9ed9f9b..6b28503fd3 100755
--- a/blog/preferences.php
+++ b/blog/preferences.php
@@ -67,15 +67,14 @@ $site = get_site();
$strpreferences = get_string('preferences');
$strblogs = get_string('blogs', 'blog');
-$navlinks = array(array('name' => $strblogs, 'link' => "$CFG->wwwroot/blog/", 'type' => 'misc'));
-$navlinks[] = array('name' => $strpreferences, 'link' => null, 'type' => 'misc');
-$navigation = build_navigation($navlinks);
$title = "$site->shortname: $strblogs : $strpreferences";
$PAGE->set_title($title);
$PAGE->set_heading($title);
+$PAGE->navbar->add($strblogs, new moodle_url($CFG->wwwroot.'/blog/'));
+$PAGE->navbar->add($strpreferences);
-echo $OUTPUT->header($navigation);
+echo $OUTPUT->header();
echo $OUTPUT->heading("$strblogs : $strpreferences", 2);
--
2.39.5