mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-05 00:22:43 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marina Glancy 2013-10-08 12:03:15 +11:00
commit 04a4de20e8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/forum/post.php
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); $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 } 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; $post->subject = $strre.' '.$post->subject;
} }
// Unsetting this will allow the correct return URL to be calculated later.
unset($SESSION->fromdiscussion); unset($SESSION->fromdiscussion);
} else if (!empty($edit)) { // User is editing their own post } 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); $post = trusttext_pre_edit($post, 'message', $modcontext);
// Unsetting this will allow the correct return URL to be calculated later.
unset($SESSION->fromdiscussion); unset($SESSION->fromdiscussion);
}else if (!empty($delete)) { // User is deleting a post }else if (!empty($delete)) { // User is deleting a post
if (! $post = forum_get_post_full($delete)) { if (! $post = forum_get_post_full($delete)) {