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

Merge branch 'MDL-25176_m24' of https://github.com/merrill-oakland/moodle into MOODLE_24_STABLE

Browse Source
This commit is contained in:
Marina Glancy
2013-10-08 12:04:12 +11:00
parent c01c608fdc 236a2fca9b
commit b159b57207
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/post.php
+4 -2
View File
@@ -152,7 +152,8 @@ if (!empty($forum)) { // User is starting a new discussion in a forum
$post->groupid = groups_get_activity_group($cm);
}
forum_set_return();
// Unsetting this will allow the correct return URL to be calculated later.
unset($SESSION->fromdiscussion);
} else if (!empty($reply)) { // User is writing a new reply
@@ -227,6 +228,7 @@ if (!empty($forum)) { // User is starting a new discussion in a forum
$post->subject = $strre.' '.$post->subject;
}
// Unsetting this will allow the correct return URL to be calculated later.
unset($SESSION->fromdiscussion);
} else if (!empty($edit)) { // User is editing their own post
@@ -277,9 +279,9 @@ if (!empty($forum)) { // User is starting a new discussion in a forum
$post = trusttext_pre_edit($post, 'message', $modcontext);
// Unsetting this will allow the correct return URL to be calculated later.
unset($SESSION->fromdiscussion);
}else if (!empty($delete)) { // User is deleting a post
if (! $post = forum_get_post_full($delete)) {