diff options
| author | Mikel Alejo <mikelalejobr@outlook.com> | 2018-07-29 11:53:59 +0200 |
|---|---|---|
| committer | MikelAlejoBR <mikelalejobr@outlook.com> | 2018-07-29 11:57:34 +0200 |
| commit | 43be40c1ae11a7fdc6fd31e5db6975c29c37bea8 (patch) | |
| tree | 3605d2ff610180ea50950d42ca0391eebf6990c4 | |
| parent | a7d7dfee9ce8ca070b8fda0df3069aa05fe12ceb (diff) | |
| parent | 740006ba60a2f5dce6e0aee072f5683f3f47b69a (diff) | |
| download | forums-43be40c1ae11a7fdc6fd31e5db6975c29c37bea8.tar forums-43be40c1ae11a7fdc6fd31e5db6975c29c37bea8.tar.gz forums-43be40c1ae11a7fdc6fd31e5db6975c29c37bea8.tar.bz2 forums-43be40c1ae11a7fdc6fd31e5db6975c29c37bea8.tar.xz forums-43be40c1ae11a7fdc6fd31e5db6975c29c37bea8.zip | |
[ticket/15733] Merge related ticket PHPBB3-15697
PHPBB3-15733
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index bf18e76568..2b8468590e 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,7 +1173,6 @@ 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 .= ($draft_id || isset($_REQUEST['draft_loaded'])) ? '<input type="hidden" name="draft_loaded" value="' . ((isset($_REQUEST['draft_loaded'])) ? $request->variable('draft_loaded', 0) : $draft_id) . '" />' : ''; |