MDL-25176 forum Redirects for new discussions shouldn't use SESSION

Unset the session->fromdiscussion var, because we know that the correct
path will be computed later.
This commit is contained in:
Eric Merrill 2013-09-30 19:52:30 -04:00
parent d45e65ccad
commit 46691973b3

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)) {