aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_queue.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2008-11-24 00:20:33 +0000
committerNils Adermann <naderman@naderman.de>2008-11-24 00:20:33 +0000
commit07e9b83a3de0264916a058b9cf180b91b297604f (patch)
tree386aed44943159d6634f74ee756c4073d5dbab19 /phpBB/includes/mcp/mcp_queue.php
parent8427ae3fd4bd0055931579d18cb9d43d69f72a90 (diff)
downloadforums-07e9b83a3de0264916a058b9cf180b91b297604f.tar
forums-07e9b83a3de0264916a058b9cf180b91b297604f.tar.gz
forums-07e9b83a3de0264916a058b9cf180b91b297604f.tar.bz2
forums-07e9b83a3de0264916a058b9cf180b91b297604f.tar.xz
forums-07e9b83a3de0264916a058b9cf180b91b297604f.zip
- updated all code to use the request class instead of any direct access to
super globals - disabled super globals in common.php. See commit r9101 for more information - cleaned up/simplified a few lines along the way. git-svn-id: file:///svn/phpbb/trunk@9102 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_queue.php')
-rw-r--r--phpBB/includes/mcp/mcp_queue.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 48bcd044f5..b94c838d43 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -484,7 +484,7 @@ function approve_post($post_id_list, $id, $mode)
if (confirm_box(true))
{
- $notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
+ $notify_poster = request::is_set('notify_poster');
// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
@@ -803,7 +803,7 @@ function disapprove_post($post_id_list, $id, $mode)
'redirect' => $redirect)
);
- $notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
+ $notify_poster = request::is_set('notify_poster');
$disapprove_reason = '';
if ($reason_id)
@@ -818,7 +818,6 @@ function disapprove_post($post_id_list, $id, $mode)
if (!$row || (!$reason && strtolower($row['reason_title']) == 'other'))
{
$additional_msg = $user->lang['NO_REASON_DISAPPROVAL'];
- unset($_POST['confirm']);
}
else
{
@@ -837,7 +836,7 @@ function disapprove_post($post_id_list, $id, $mode)
$post_info = get_post_data($post_id_list, 'm_approve');
- if (confirm_box(true))
+ if (!$additional_message && confirm_box(true))
{
// If Topic -> forum_topics_real -= 1