From cfd1bcfa03f6fbee98b0bcad16afdd06ca12cbf1 Mon Sep 17 00:00:00 2001
From: Adrian Greeve <adrian@moodle.com>
Date: Tue, 12 Apr 2016 11:53:34 +0800
Subject: [PATCH] MDL-52642 blog: Fix notices for swapping contexts in
 activities.

---
 blog/edit.php  | 10 +++++++---
 blog/index.php |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/blog/edit.php b/blog/edit.php
index 82480390c3c..6b13994ba18 100644
--- a/blog/edit.php
+++ b/blog/edit.php
@@ -64,9 +64,13 @@ if ($id) {
 
 $sitecontext = context_system::instance();
 $usercontext = context_user::instance($userid);
-$PAGE->set_context($usercontext);
-$blognode = $PAGE->settingsnav->find('blogadd', null);
-$blognode->make_active();
+if ($modid) {
+    $PAGE->set_context($sitecontext);
+} else {
+    $PAGE->set_context($usercontext);
+    $blognode = $PAGE->settingsnav->find('blogadd', null);
+    $blognode->make_active();
+}
 
 require_login($courseid);
 
diff --git a/blog/index.php b/blog/index.php
index 1b64b42fe56..5aa84bd0e24 100644
--- a/blog/index.php
+++ b/blog/index.php
@@ -62,7 +62,7 @@ if ($entryid and !isset($userid)) {
     $userid = $entry->userid;
 }
 
-if (isset($userid) && empty($courseid)) {
+if (isset($userid) && empty($courseid) && empty($modid)) {
     $context = context_user::instance($userid);
 } else if (!empty($courseid) && $courseid != SITEID) {
     $context = context_course::instance($courseid);