mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

- * wildcard in a search query should cause \w+ in highlighting, not \w* [Bug #10031]

Browse Source 
- 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
This commit is contained in:
Nils Adermann
2007-04-29 20:56:46 +00:00
parent 202861eec9
commit dc747b8d99
21 changed files with 67 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/includes/mcp/mcp_queue.php
View File

@@ -274,7 +274,8 @@ class mcp_queue
FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u
WHERE ' . $db->sql_in_set('p.post_id', $post_ids) . '
AND t.topic_id = p.topic_id
AND u.user_id = p.poster_id';
AND u.user_id = p.poster_id
ORDER BY ' . $sort_order_sql;
$result = $db->sql_query($sql);
$post_data = $rowset = array();

15
phpBB/includes/mcp/mcp_reports.php
View File

@@ -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();