diff --git a/blog/header.php b/blog/header.php
index b3f29c74eac..ae361a059f9 100755
--- a/blog/header.php
+++ b/blog/header.php
@@ -15,9 +15,6 @@ $blockid = optional_param('blockid', 0, PARAM_INT);
/// If user has never visited this page before, install 2 blocks for him
blog_check_and_install_blocks();
-if (!$site = get_site()) {
- redirect($CFG->wwwroot.'/index.php');
-}
// now check that they are logged in and allowed into the course (if specified)
if ($courseid != SITEID) {
@@ -26,7 +23,7 @@ if ($courseid != SITEID) {
}
require_login($course->id);
} else {
- $course = get_site();
+ $course = $SITE;
}
// Bounds for block widths within this page
@@ -92,7 +89,7 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') { /// We are in edit mode, print the
$formHeading = get_string('addnewentry', 'blog');
}
- print_header("$site->shortname: $blogstring", "$site->fullname",
+ print_header("$SITE->shortname: $blogstring", "$SITE->fullname",
''.fullname($user).' ->
'.$blogstring.' -> '. $formHeading,'','',true);
@@ -103,20 +100,20 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') { /// We are in edit mode, print the
switch ($filtertype) {
case 'site':
if ($tagid || !empty($tag)) {
- print_header("$site->shortname: $blogstring", "",
+ print_header("$SITE->shortname: $blogstring", $SITE->fullname,
''. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());
} else {
- print_header("$site->shortname: $blogstring", "",
+ print_header("$SITE->shortname: $blogstring", $SITE->fullname,
$blogstring,'','',true,$PAGE->get_extra_header_string());
}
break;
case 'course':
if ($tagid || !empty($tag)) {
- print_header_simple("$course->shortname: $blogstring", "",
+ print_header_simple("$course->shortname: $blogstring", $course->fullname,
''. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());
} else {
- print_header_simple("$course->shortname: $blogstring", "",
+ print_header_simple("$course->shortname: $blogstring", $course->fullname,
$blogstring,'','',true,$PAGE->get_extra_header_string());
}
break;
@@ -126,11 +123,11 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') { /// We are in edit mode, print the
$thisgroup = get_record('groups', 'id', $filterselect);
if ($tagid || !empty($tag)) {
- print_header_simple("$course->shortname: $blogstring", "$course->fullname",
+ print_header_simple("$course->shortname: $blogstring", $course->fullname,
''.$thisgroup->name.' ->
'. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());
} else {
- print_header_simple("$course->shortname: $blogstring", "$course->fullname",
+ print_header_simple("$course->shortname: $blogstring", $course->fullname,
''.$thisgroup->name." ->
$blogstring",'','',true,$PAGE->get_extra_header_string());
@@ -144,14 +141,14 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') { /// We are in edit mode, print the
if (isset($course->id) && $course->id && $course->id != SITEID) {
if ($tagid || !empty($tag)) {
- print_header("$course->shortname: $blogstring", "$course->fullname",
+ print_header("$course->shortname: $blogstring", $course->fullname,
''.$course->shortname.' ->
'.$participants.' ->
'.fullname($user).' ->
'. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());
} else {
- print_header("$course->shortname: $blogstring", "$course->fullname",
+ print_header("$course->shortname: $blogstring", $course->fullname,
''.$course->shortname.' ->
'.$participants.' ->
'.fullname($user).' ->
@@ -163,12 +160,12 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') { /// We are in edit mode, print the
else {
if ($tagid || !empty($tag)) {
- print_header("$site->shortname: $blogstring", "$site->fullname",
+ print_header("$SITE->shortname: $blogstring", $SITE->fullname,
''.fullname($user).' ->
'. "$blogstring -> $tagstring: $taginstance->text",'','',true,$PAGE->get_extra_header_string());
} else {
- print_header("$site->shortname: $blogstring", "$site->fullname",
+ print_header("$SITE->shortname: $blogstring", $SITE->fullname,
''.fullname($user).' ->
'.$blogstring,'','',true,$PAGE->get_extra_header_string());
@@ -178,7 +175,7 @@ if ($ME == $CFG->wwwroot.'/blog/edit.php') { /// We are in edit mode, print the
break;
default: //user click on add from block
- print_header("$site->shortname: $blogstring", "$site->fullname",
+ print_header("$SITE->shortname: $blogstring", $SITE->fullname,
''.fullname($user).' ->
'.$blogstring.' -> '.get_string('addentry','blog'),'','',true,$PAGE->get_extra_header_string());
break;