From 46691973b3b02ce187eaab8562650a754521d673 Mon Sep 17 00:00:00 2001 From: Eric Merrill Date: Mon, 30 Sep 2013 19:52:30 -0400 Subject: [PATCH] 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. --- mod/forum/post.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/forum/post.php b/mod/forum/post.php index 6f39445a10d..e3d3decf29f 100644 --- a/mod/forum/post.php +++ b/mod/forum/post.php @@ -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)) {