diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-09-16 13:14:59 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-09-16 13:14:59 +0200 |
| commit | 3e851907988b5b8e542f0a838cebfa8185b55ac4 (patch) | |
| tree | 4ad32c4709be93d27e729f005ce8288201f6be9a /phpBB/includes | |
| parent | 18dd250f5263d4c49c83b18f7f567b3db30c8339 (diff) | |
| parent | 5be990e9599f41a87d2c9d847a351b4b03e8debd (diff) | |
| download | forums-3e851907988b5b8e542f0a838cebfa8185b55ac4.tar forums-3e851907988b5b8e542f0a838cebfa8185b55ac4.tar.gz forums-3e851907988b5b8e542f0a838cebfa8185b55ac4.tar.bz2 forums-3e851907988b5b8e542f0a838cebfa8185b55ac4.tar.xz forums-3e851907988b5b8e542f0a838cebfa8185b55ac4.zip | |
Merge pull request #5305 from MikelAlejoBR/ticket/15733
[ticket/15733] Remove unused code related to deprecated flood control
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index bf18e76568..f35812b90a 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -48,7 +48,6 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $to_group_id = $request->variable('g', 0); $msg_id = $request->variable('p', 0); $draft_id = $request->variable('d', 0); - $lastclick = $request->variable('lastclick', 0); // Reply to all triggered (quote/reply) $reply_to_all = $request->variable('reply_to_all', 0); @@ -80,7 +79,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $group_helper = $phpbb_container->get('group_helper'); // Was cancel pressed? If so then redirect to the appropriate page - if ($cancel || ($current_time - $lastclick < 2 && $submit)) + if ($cancel) { if ($msg_id) { @@ -1174,8 +1173,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) break; } - $s_hidden_fields = '<input type="hidden" name="lastclick" value="' . $current_time . '" />'; - $s_hidden_fields .= (isset($check_value)) ? '<input type="hidden" name="status_switch" value="' . $check_value . '" />' : ''; + $s_hidden_fields = (isset($check_value)) ? '<input type="hidden" name="status_switch" value="' . $check_value . '" />' : ''; $s_hidden_fields .= ($draft_id || isset($_REQUEST['draft_loaded'])) ? '<input type="hidden" name="draft_loaded" value="' . ((isset($_REQUEST['draft_loaded'])) ? $request->variable('draft_loaded', 0) : $draft_id) . '" />' : ''; $form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || !$config['allow_pm_attach'] || !$auth->acl_get('u_pm_attach')) ? '' : ' enctype="multipart/form-data"'; |