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/includes/ucp/ucp_pm_compose.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/includes/ucp/ucp_pm_compose.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 51018e3a5d..8b7d42e9c9 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -55,7 +55,6 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $address_list = $request->variable('address_list', array('' => array(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; @@ -69,6 +68,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $refresh = isset($_POST['add_file']) || isset($_POST['delete_file']) || $save || $load || $remove_u || $remove_g || $add_to || $add_bcc; + $submit = $request->is_set_post('post') && !$refresh && !$preview; $action = ($delete && !$preview && !$refresh && $submit) ? 'delete' : $action; $select_single = ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? false : true; |