diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-06-08 17:19:11 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2015-06-08 17:19:11 +0200 |
| commit | c2d254ea414cc4a21a4b40dad878b91c00c66912 (patch) | |
| tree | a61f8884eaf21987a1ce3caa2a5cace79c5eb09d /phpBB/posting.php | |
| parent | 25c4c481d74f2272218fced8506cb7861eec8a75 (diff) | |
| parent | 2c6369c5d90134b761ffd1da86401deff571f636 (diff) | |
| download | forums-c2d254ea414cc4a21a4b40dad878b91c00c66912.tar forums-c2d254ea414cc4a21a4b40dad878b91c00c66912.tar.gz forums-c2d254ea414cc4a21a4b40dad878b91c00c66912.tar.bz2 forums-c2d254ea414cc4a21a4b40dad878b91c00c66912.tar.xz forums-c2d254ea414cc4a21a4b40dad878b91c00c66912.zip | |
Merge branch 'ticket/13833-30x' into ticket/13833
Conflicts:
phpBB/posting.php
PHPBB3-13833
Diffstat (limited to 'phpBB/posting.php')
| -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 e7a21d2c79..7e3611c368 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -35,7 +35,6 @@ $forum_id = request_var('f', 0); $draft_id = request_var('d', 0); $lastclick = request_var('lastclick', 0); -$submit = (isset($_POST['post'])) ? true : false; $preview = (isset($_POST['preview'])) ? true : false; $save = (isset($_POST['save'])) ? true : false; $load = (isset($_POST['load'])) ? true : false; @@ -43,6 +42,7 @@ $confirm = $request->is_set_post('confirm'); $cancel = (isset($_POST['cancel']) && !isset($_POST['save'])) ? true : false; $refresh = (isset($_POST['add_file']) || isset($_POST['delete_file']) || isset($_POST['cancel_unglobalise']) || $save || $load || $preview); +$submit = $request->is_set_post('post') && !$refresh && !$preview; $mode = request_var('mode', ''); // If the user is not allowed to delete the post, we try to soft delete it, so we overwrite the mode here. |