aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/mcp')
-rw-r--r--phpBB/includes/mcp/mcp_main.php14
-rw-r--r--phpBB/includes/mcp/mcp_queue.php6
2 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 93a430048f..44e6b5acd6 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -379,8 +379,8 @@ function change_topic_type($mode, $topic_ids)
// Move Topic
function mcp_move_topic($topic_ids)
{
- global $auth, $user, $db, $SID, $phpEx, $phpbb_root_path, $template;
- global $_POST, $_REQUEST;
+ global $auth, $user, $db, $template;
+ global $SID, $phpEx, $phpbb_root_path;
if (!($forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', 'm_move')))
{
@@ -481,10 +481,10 @@ function mcp_move_topic($topic_ids)
);
$db->sql_query('INSERT INTO ' . TOPICS_TABLE . $db->sql_build_array('INSERT', $shadow));
- $next_id = $db->sql_nextid();
-
+
+ // $next_id = $db->sql_nextid();
// Mark Shadow topic read
- markread('topic', $row['forum_id'], $next_id);
+ // markread('topic', $row['forum_id'], $next_id);
}
}
unset($topic_data);
@@ -693,8 +693,8 @@ function mcp_delete_post($post_ids)
// Fork Topic
function mcp_fork_topic($topic_ids)
{
- global $auth, $user, $db, $SID, $phpEx, $phpbb_root_path, $template, $config;
- global $_POST, $_REQUEST;
+ global $auth, $user, $db, $template, $config;
+ global $SID, $phpEx, $phpbb_root_path;
if (!($forum_id = check_ids($topic_ids, TOPICS_TABLE, 'topic_id', 'm_')))
{
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 4ba504a988..93d1055924 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -306,7 +306,7 @@ class mcp_queue extends module
function approve_post($post_id_list)
{
global $db, $template, $user, $config;
- global $_REQUEST, $phpEx, $phpbb_root_path, $SID;
+ global $phpEx, $phpbb_root_path, $SID;
if (!($forum_id = check_ids($post_id_list, POSTS_TABLE, 'post_id', 'm_approve')))
{
@@ -527,7 +527,7 @@ function approve_post($post_id_list)
function disapprove_post($post_id_list)
{
global $db, $template, $user, $config;
- global $_REQUEST, $_POST, $phpEx, $phpbb_root_path, $SID;
+ global $phpEx, $phpbb_root_path, $SID;
if (!($forum_id = check_ids($post_id_list, POSTS_TABLE, 'post_id', 'm_approve')))
{
@@ -718,7 +718,7 @@ function disapprove_post($post_id_list)
'ADDITIONAL_MSG' => $additional_msg)
);
- confirm_box(false, 'APPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
+ confirm_box(false, 'DISAPPROVE_POST' . ((sizeof($post_id_list) == 1) ? '' : 'S'), $s_hidden_fields, 'mcp_approve.html');
}
$redirect = request_var('redirect', "index.$phpEx$SID");