diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-08 17:59:49 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-08 17:59:49 +0200 |
| commit | d3e55a8290bcec35d7fdf5a00f46ef5bce62e28d (patch) | |
| tree | 0dfb50ad71ba7b8f48f7e706cfcb0f1bc7d8eb9c /phpBB/posting.php | |
| parent | 04c9520c73a0a0c61ee8331ed36f58e9904a5cb7 (diff) | |
| parent | 12142108645f550fa376da1aa2d3223a4f9b5dca (diff) | |
| download | forums-d3e55a8290bcec35d7fdf5a00f46ef5bce62e28d.tar forums-d3e55a8290bcec35d7fdf5a00f46ef5bce62e28d.tar.gz forums-d3e55a8290bcec35d7fdf5a00f46ef5bce62e28d.tar.bz2 forums-d3e55a8290bcec35d7fdf5a00f46ef5bce62e28d.tar.xz forums-d3e55a8290bcec35d7fdf5a00f46ef5bce62e28d.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/posting.php
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 cba967779f..4a8da8e7ce 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -35,7 +35,6 @@ $forum_id = $request->variable('f', 0); $draft_id = $request->variable('d', 0); $lastclick = $request->variable('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->variable('mode', ''); // If the user is not allowed to delete the post, we try to soft delete it, so we overwrite the mode here. |