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/includes | |
| 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/includes')
| -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 4ff27e8cf1..61dab982df 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; |