diff options
| author | Nils Adermann <naderman@naderman.de> | 2009-07-22 13:33:54 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2009-07-22 13:33:54 +0000 |
| commit | 00e81e704d78c7f4f45d1536ad170ed8dd985e84 (patch) | |
| tree | 30c3a68f8226804b6bb3796425aa84bf2517f5d1 /phpBB/includes/mcp/mcp_pm_reports.php | |
| parent | 54f78a50bc6162fd49e506892a455f7bb43e31fb (diff) | |
| download | forums-00e81e704d78c7f4f45d1536ad170ed8dd985e84.tar forums-00e81e704d78c7f4f45d1536ad170ed8dd985e84.tar.gz forums-00e81e704d78c7f4f45d1536ad170ed8dd985e84.tar.bz2 forums-00e81e704d78c7f4f45d1536ad170ed8dd985e84.tar.xz forums-00e81e704d78c7f4f45d1536ad170ed8dd985e84.zip | |
fix mcp sorting for pm_reports, and some minor language changes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9830 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_pm_reports.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_pm_reports.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php index 0e94d7e017..72f77fae7c 100644 --- a/phpBB/includes/mcp/mcp_pm_reports.php +++ b/phpBB/includes/mcp/mcp_pm_reports.php @@ -221,7 +221,7 @@ class mcp_pm_reports if ($mode == 'pm_reports') { - $report_state = 'pm.message_reported = 1 AND r.report_closed = 0'; + $report_state = 'p.message_reported = 1 AND r.report_closed = 0'; } else { @@ -229,10 +229,10 @@ class mcp_pm_reports } $sql = 'SELECT r.report_id - FROM ' . PRIVMSGS_TABLE . ' pm, ' . REPORTS_TABLE . ' r ' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . (($sort_order_sql[0] == 'r') ? ', ' . USERS_TABLE . ' ru' : '') . " + FROM ' . PRIVMSGS_TABLE . ' p, ' . REPORTS_TABLE . ' r ' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . (($sort_order_sql[0] == 'r') ? ', ' . USERS_TABLE . ' ru' : '') . " WHERE $report_state - AND r.pm_id = pm.msg_id - " . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = pm.author_id' : '') . ' + AND r.pm_id = p.msg_id + " . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.author_id' : '') . ' ' . (($sort_order_sql[0] == 'r') ? 'AND ru.user_id = r.user_id' : '') . " AND r.post_id = 0 $limit_time_sql |