diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-10 18:43:51 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-10 18:43:51 +0100 |
| commit | 6a90172e1a25df241e55e5522f9c0a829f9fcce4 (patch) | |
| tree | 024ec63a3c14dfe826ff287756b04584d6321fd3 | |
| parent | 8a6c82a0ef9d098de41784726c6e837883bd5f30 (diff) | |
| parent | ad8363ae577bc8e11a19b1a50e1e982f82b525be (diff) | |
| download | forums-6a90172e1a25df241e55e5522f9c0a829f9fcce4.tar forums-6a90172e1a25df241e55e5522f9c0a829f9fcce4.tar.gz forums-6a90172e1a25df241e55e5522f9c0a829f9fcce4.tar.bz2 forums-6a90172e1a25df241e55e5522f9c0a829f9fcce4.tar.xz forums-6a90172e1a25df241e55e5522f9c0a829f9fcce4.zip | |
Merge branch '3.2.x'
| -rw-r--r-- | phpBB/posting.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index 6cfb877f75..692f3c8092 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -104,7 +104,7 @@ $vars = array( extract($phpbb_dispatcher->trigger_event('core.modify_posting_parameters', compact($vars))); // Was cancel pressed? If so then redirect to the appropriate page -if ($cancel || ($current_time - $lastclick < 2 && $submit)) +if ($cancel) { $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"))); |