L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-52642 blog: Fix notices for swapping contexts in activities.

Browse Source
This commit is contained in:
Adrian Greeve
2016-04-12 11:53:34 +08:00
parent 2ed2e692a6
commit cfd1bcfa03
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blog/edit.php
+7 -3
View File
@@ -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);
blog/index.php
+1 -1
View File
@@ -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);