diff options
Diffstat (limited to 'phpBB/includes')
| -rwxr-xr-x | phpBB/includes/mcp/mcp_reports.php | 9 | ||||
| -rwxr-xr-x | phpBB/includes/search/fulltext_native.php | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 8614e0cdd2..004c774957 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -352,7 +352,14 @@ function close_report($post_id_list, $mode, $action) trigger_error('NOT_AUTHORIZED'); } - $redirect = request_var('redirect', $user->data['session_page']); + if (($action == 'delete') && (strpos($user->data['session_page'], 'mode=report_details') !== false)) + { + $redirect = request_var('redirect', build_url(array('mode')) . '&mode=reports'); + } + else + { + $redirect = request_var('redirect', $user->data['session_page']); + } $success_msg = ''; $s_hidden_fields = build_hidden_fields(array( diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index 71941f8bfc..eec7415dd8 100755 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -825,7 +825,7 @@ class fulltext_native extends search_backend } $db->sql_freeresult($result); - $new_words = array_diff($unique_add_words, array_keys($word_ids)); + $new_words = array_map(array(&$db, 'sql_escape'), array_diff($unique_add_words, array_keys($word_ids))); if (sizeof($new_words)) { |