mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-09 21:08:53 +00:00
Merge branch '3.1.x'
Conflicts: phpBB/posting.php
This commit is contained in:
commit
d3e55a8290
2 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Add table
Reference in a new issue