diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:41:10 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:41:10 +0100 |
| commit | 6894477b600f4a1ffaa6c8ce7fde45465e1f5c07 (patch) | |
| tree | b1c3a3dd07bb481a1c7fa8ba54d7b74b4795a83c /phpBB/includes/mcp | |
| parent | 665982bb324c1b846d68ebd296eed3a83edb9d81 (diff) | |
| parent | ab8ecf5b92e5e2ac5bcc63e5c576a04948dd19b5 (diff) | |
| download | forums-6894477b600f4a1ffaa6c8ce7fde45465e1f5c07.tar forums-6894477b600f4a1ffaa6c8ce7fde45465e1f5c07.tar.gz forums-6894477b600f4a1ffaa6c8ce7fde45465e1f5c07.tar.bz2 forums-6894477b600f4a1ffaa6c8ce7fde45465e1f5c07.tar.xz forums-6894477b600f4a1ffaa6c8ce7fde45465e1f5c07.zip | |
Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into develop-olympus
* github-nickvergessen/ticket/9956:
[ticket/9956] Display error message if no disapprove reason given
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index c419da5574..764461fa53 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -216,6 +216,7 @@ class mcp_queue 'POST_IP' => $post_info['poster_ip'], 'POST_IPADDR' => ($auth->acl_get('m_info', $post_info['forum_id']) && request_var('lookup', '')) ? @gethostbyaddr($post_info['poster_ip']) : '', 'POST_ID' => $post_info['post_id'], + 'S_FIRST_POST' => ($post_info['topic_first_post_id'] == $post_id), 'U_LOOKUP_IP' => ($auth->acl_get('m_info', $post_info['forum_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&f=' . $post_info['forum_id'] . '&p=' . $post_id . '&lookup=' . $post_info['poster_ip']) . '#ip' : '', )); @@ -778,6 +779,8 @@ function disapprove_post($post_id_list, $id, $mode) if (!$row || (!$reason && strtolower($row['reason_title']) == 'other')) { $additional_msg = $user->lang['NO_REASON_DISAPPROVAL']; + unset($_REQUEST['confirm_key']); + unset($_POST['confirm_key']); unset($_POST['confirm']); } else |