mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

fix mcp sorting for pm_reports, and some minor language changes

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9830 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann
2009-07-22 13:33:54 +00:00
parent 54f78a50bc
commit 00e81e704d
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/mcp/mcp_pm_reports.php
View File

@@ -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