aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-06-07 19:32:23 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-06-07 19:32:23 +0000
commit0e7adebad6e61c066b52e5480d5aa36a23571388 (patch)
tree084461c12434d2b18e791d482ee352566fc0b65e /phpBB/includes/mcp
parent13b9021ae436a625aed61ba20b9d337bf585f6ba (diff)
downloadforums-0e7adebad6e61c066b52e5480d5aa36a23571388.tar
forums-0e7adebad6e61c066b52e5480d5aa36a23571388.tar.gz
forums-0e7adebad6e61c066b52e5480d5aa36a23571388.tar.bz2
forums-0e7adebad6e61c066b52e5480d5aa36a23571388.tar.xz
forums-0e7adebad6e61c066b52e5480d5aa36a23571388.zip
ok, sorry for this. :/
- cleaned up table names/constants git-svn-id: file:///svn/phpbb/trunk@6021 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp')
-rw-r--r--phpBB/includes/mcp/mcp_front.php10
-rw-r--r--phpBB/includes/mcp/mcp_post.php2
-rw-r--r--phpBB/includes/mcp/mcp_queue.php2
-rwxr-xr-xphpBB/includes/mcp/mcp_reports.php2
4 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index b9e4f083c7..cf2fca1c64 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -127,11 +127,11 @@ function mcp_front_view($id, $mode, $action)
'SELECT' => 'r.*, p.post_id, p.post_subject, u.username, t.topic_id, t.topic_title, f.forum_id, f.forum_name',
'FROM' => array(
- REPORTS_TABLE => 'r',
- REASONS_TABLE => 'rr',
- TOPICS_TABLE => 't',
- USERS_TABLE => 'u',
- POSTS_TABLE => 'p'
+ REPORTS_TABLE => 'r',
+ REPORTS_REASONS_TABLE => 'rr',
+ TOPICS_TABLE => 't',
+ USERS_TABLE => 'u',
+ POSTS_TABLE => 'p'
),
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php
index 9110695180..f8f7b9a16b 100644
--- a/phpBB/includes/mcp/mcp_post.php
+++ b/phpBB/includes/mcp/mcp_post.php
@@ -159,7 +159,7 @@ function mcp_post_details($id, $mode, $action)
if ($auth->acl_get('m_', $post_info['forum_id']))
{
$sql = 'SELECT r.*, re.*, u.user_id, u.username
- FROM ' . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u, ' . REASONS_TABLE . " re
+ FROM ' . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u, ' . REPORTS_REASONS_TABLE . " re
WHERE r.post_id = $post_id
AND r.reason_id = re.reason_id
AND u.user_id = r.user_id
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index f1a9b19acf..f2d82715bc 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -578,7 +578,7 @@ function disapprove_post($post_id_list, $mode)
if ($reason_id)
{
$sql = 'SELECT reason_title, reason_description
- FROM ' . REASONS_TABLE . "
+ FROM ' . REPORTS_REASONS_TABLE . "
WHERE reason_id = $reason_id";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index a6725e887e..41526254f0 100755
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -71,7 +71,7 @@ class mcp_reports
$post_info = $post_info[$post_id];
$sql = 'SELECT r.user_id, r.report_closed, report_time, r.report_text, rr.reason_title, rr.reason_description, u.username
- FROM ' . REPORTS_TABLE . ' r, ' . REASONS_TABLE . ' rr, ' . USERS_TABLE . " u
+ FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . " u
WHERE r.post_id = $post_id
AND rr.reason_id = r.reason_id
AND r.user_id = u.user_id";