diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:42:44 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:42:44 +0100 |
| commit | 0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32 (patch) | |
| tree | 4f21631e83f71ffaa3c546b30e757b547b5b29c8 /phpBB/includes/mcp/mcp_queue.php | |
| parent | a4acd62f3b12557a8af103c0f58dba0803b919ce (diff) | |
| parent | 6894477b600f4a1ffaa6c8ce7fde45465e1f5c07 (diff) | |
| download | forums-0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32.tar forums-0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32.tar.gz forums-0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32.tar.bz2 forums-0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32.tar.xz forums-0a4efcbe8c9e4fe13d4a726f30f38d01d1334e32.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9956] Display error message if no disapprove reason given
Conflicts:
phpBB/includes/mcp/mcp_queue.php
Diffstat (limited to 'phpBB/includes/mcp/mcp_queue.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_queue.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 0630f55b12..1f9fcffbe7 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' : '', )); @@ -754,7 +755,10 @@ function disapprove_post($post_id_list, $id, $mode) if (!$row || (!$reason && strtolower($row['reason_title']) == 'other')) { $additional_msg = $user->lang['NO_REASON_DISAPPROVAL']; + $request->overwrite('confirm', null, phpbb_request_interface::POST); + $request->overwrite('confirm_key', null, phpbb_request_interface::POST); + $request->overwrite('confirm_key', null, phpbb_request_interface::REQUEST); } else { |