diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-04-29 20:56:46 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-04-29 20:56:46 +0000 |
| commit | dc747b8d994b6f5d07182196ed9deed7959a7317 (patch) | |
| tree | 82796847148a27d822ea17199ee055244fc3028e /phpBB/includes/mcp/mcp_reports.php | |
| parent | 202861eec9ca571cfae48002f2e0524986ae69bf (diff) | |
| download | forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar.gz forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar.bz2 forums-dc747b8d994b6f5d07182196ed9deed7959a7317.tar.xz forums-dc747b8d994b6f5d07182196ed9deed7959a7317.zip | |
- * wildcard in a search query should cause \w+ in highlighting, not \w* [Bug #10031]
- display a warning that the search index is not converted from phpBB2 to phpBB3 [Bug #9761]
- forgot to add : to reg_name when deleting userinfo from the url regex constructor [Bug #9868]
- magic urls should work after ">"
- fixed sorting in mcp_reports/mcp_queue [Bug #9882]
- display a "Report has already been closed" message, if a post is accessed in mcp_reports which has a closed report (might occur if two moderators want to process it at the same time)
- convertor: old forum path should have the trailing slash removed
- subsilver2 will come bundled with phpBB3, but it will not be installed by default (if admins want to use it they can, but it's not a default option for users)
- prosilver was missing the topic-only mode in mcp_reports/mcp_queue
git-svn-id: file:///svn/phpbb/trunk@7428 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_reports.php')
| -rwxr-xr-x | phpBB/includes/mcp/mcp_reports.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 5a50190848..06d5ffd03d 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -66,10 +66,11 @@ class mcp_reports $sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . ' u - WHERE ' . (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id AND r.report_closed = 0") . ' + WHERE ' . (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id") . ' AND rr.reason_id = r.reason_id - AND r.user_id = u.user_id'; - $result = $db->sql_query($sql); + AND r.user_id = u.user_id + ORDER BY report_closed ASC'; + $result = $db->sql_query_limit($sql, 1); $report = $db->sql_fetchrow($result); $db->sql_freeresult($result); @@ -78,6 +79,11 @@ class mcp_reports trigger_error('NO_REPORT'); } + if (!$report_id && $report['report_closed']) + { + trigger_error('REPORT_CLOSED'); + } + $post_id = $report['post_id']; $report_id = $report['report_id']; @@ -303,7 +309,8 @@ class mcp_reports AND t.topic_id = p.topic_id AND r.post_id = p.post_id AND u.user_id = p.poster_id - AND ru.user_id = r.user_id'; + AND ru.user_id = r.user_id + ORDER BY ' . $sort_order_sql; $result = $db->sql_query($sql); $report_data = $rowset = array(); |