Merged MDL-8566 from 1.9

diff --git a/blog/header.php b/blog/header.php
index 7835ede37ca349dd123ce44af45d7676249269ed..aee8625334cb7fd9281f1f1b8977a3d39f6ee776 100755 (executable)
--- a/blog/header.php
+++ b/blog/header.php
@@ -188,29 +188,35 @@ $navlinks = array();
                     $navlinks[] = array('name' => "$tagstring: $taginstance->name", 'link' => null, 'type' => 'misc');
                     $navigation = build_navigation($navlinks);
 
-                    print_header("$course->shortname: $blogstring", $course->fullname, $navigation,'','',true,$PAGE->get_extra_header_string());
-
                 } else {
                     $navlinks[] = array('name' => $blogstring, 'link' => null, 'type' => 'misc');
                     $navigation = build_navigation($navlinks);
-                    print_header("$course->shortname: $blogstring", $course->fullname, $navigation,'','',true,$PAGE->get_extra_header_string());
                 }
+                print_header("$course->shortname: $blogstring", $course->fullname, $navigation,'','',true,$PAGE->get_extra_header_string());
 
             } else {
 
             //in top view
 
-                if ($tagid || !empty($tag)) {
+                if ($postid) {
                     $navlinks[] = array('name' => fullname($user),
                                         'link' => "$CFG->wwwroot/user/view.php?id=$filterselect",
                                         'type' => 'misc');
                     $navlinks[] = array('name' => $blogstring,
                                         'link' => "index.php?filtertype=user&filterselect=$filterselect",
                                         'type' => 'misc');
-                    $navlinks[] = array('name' => "$tagstring: $taginstance->name", 'link' => null, 'type' => 'misc');
+                    $navlinks[] = array('name' => format_string($postobject->subject), 'link' => null, 'type' => 'misc');
                     $navigation = build_navigation($navlinks);
 
-                    print_header("$SITE->shortname: $blogstring", $SITE->fullname, $navigation,'','',true,$PAGE->get_extra_header_string());
+                } else if ($tagid || !empty($tag)) {
+                    $navlinks[] = array('name' => fullname($user),
+                                        'link' => "$CFG->wwwroot/user/view.php?id=$filterselect",
+                                        'type' => 'misc');
+                    $navlinks[] = array('name' => $blogstring,
+                                        'link' => "index.php?filtertype=user&filterselect=$filterselect",
+                                        'type' => 'misc');
+                    $navlinks[] = array('name' => "$tagstring: $taginstance->name", 'link' => null, 'type' => 'misc');
+                    $navigation = build_navigation($navlinks);
 
                 } else {
                     $navlinks[] = array('name' => fullname($user),
@@ -218,9 +224,8 @@ $navlinks = array();
                                         'type' => 'misc');
                     $navlinks[] = array('name' => $blogstring, 'link' => null, 'type' => 'misc');
                     $navigation = build_navigation($navlinks);
-                    print_header("$SITE->shortname: $blogstring", $SITE->fullname, $navigation,'','',true,$PAGE->get_extra_header_string());
-
                 }
+                print_header("$SITE->shortname: $blogstring", $SITE->fullname, $navigation,'','',true,$PAGE->get_extra_header_string());
 
             }
         break;

diff --git a/blog/index.php b/blog/index.php
index 71ea5b705065de2825c702e8a151bbad99e06c19..27044896dd513f270135e22956f80ded7eb80593 100755 (executable)
--- a/blog/index.php
+++ b/blog/index.php
@@ -40,8 +40,16 @@ if (empty($filtertype)) {
         $filtertype = 'user';
         $filterselect = $userid;
     } else if (has_capability('moodle/blog:view', $sitecontext) and $CFG->bloglevel > BLOG_USER_LEVEL) {
-        $filtertype = 'site';
-        $filterselect = '';
+        if ($postid) {
+            $filtertype = 'user';
+            if (!$postobject = get_record('post', 'module', 'blog', 'id', $postid)) {
+                error('No such blog entry');
+            }
+            $filterselect = $postobject->userid;
+        } else {
+            $filtertype = 'site';
+            $filterselect = '';
+        }
     } else {
         // user might have capability to write blogs, but not read blogs at site level
         // users might enter this url manually without parameters