diff options
| author | Jim Wigginton <terrafrost@phpbb.com> | 2009-03-24 16:43:52 +0000 |
|---|---|---|
| committer | Jim Wigginton <terrafrost@phpbb.com> | 2009-03-24 16:43:52 +0000 |
| commit | 777c7538902f540cdd0d835a9ffaf4107f46899f (patch) | |
| tree | dd158ef7505b11e2506ae12f5c99a805c3b7fca4 | |
| parent | d75616c71708b812dc2ac88594985cdaef2f896a (diff) | |
| download | forums-777c7538902f540cdd0d835a9ffaf4107f46899f.tar forums-777c7538902f540cdd0d835a9ffaf4107f46899f.tar.gz forums-777c7538902f540cdd0d835a9ffaf4107f46899f.tar.bz2 forums-777c7538902f540cdd0d835a9ffaf4107f46899f.tar.xz forums-777c7538902f540cdd0d835a9ffaf4107f46899f.zip | |
Fixed bug #40565 – Cancel when replying to global announcement redirects to first forum - not to the current forum
Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9406 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/posting.php | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 193a2ced42..1d5c51ce35 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -127,6 +127,7 @@ <li>[Fix] Mass Email works again for users with empty jabber address but notification set to 'both'. (Bug #39755)</li> <li>[Fix] Fix race condition for updating post/topic/etc. counter. (reported by BartVB)</li> <li>[Fix] Fix duplicate creation of acl options in acl_add_options() under certain conditions. (Bug #38385, #40225)</li> + <li>[Fix] Cancel when replying to global announcement redirects to first forum - not to the current forum (Bug #41225 - Patch by TerraFrost)</li> <li>[Change] Allow download of conflicting file for later reference in automatic updater</li> <li>[Change] Default difference view is now 'inline' instead of 'side by side'</li> <li>[Change] Added new option for merging differences to conflicting files in automatic updater</li> diff --git a/phpBB/posting.php b/phpBB/posting.php index 58d834dd21..0da99b3c56 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -49,7 +49,8 @@ $current_time = time(); // Was cancel pressed? If so then redirect to the appropriate page if ($cancel || ($current_time - $lastclick < 2 && $submit)) { - $redirect = ($post_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $post_id) . '#p' . $post_id : (($topic_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $topic_id) : (($forum_id) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) : append_sid("{$phpbb_root_path}index.$phpEx"))); + $f = ($forum_id) ? 'f=' . $forum_id . '&' : ''; + $redirect = ($post_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", $f . 'p=' . $post_id) . '#p' . $post_id : (($topic_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", $f . 't=' . $topic_id) : (($forum_id) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) : append_sid("{$phpbb_root_path}index.$phpEx"))); redirect($redirect); } |