diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-06-16 18:31:51 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-06-16 18:31:51 +0000 |
| commit | d4a2bec8d3c83b3e10ed128875acef886c908cd8 (patch) | |
| tree | 1a40a5deebc2d846f5b5c98b04b96e84f9ea38eb | |
| parent | 010e453b45e875d6eefdcf1fb2d20d4341c0b64a (diff) | |
| download | forums-d4a2bec8d3c83b3e10ed128875acef886c908cd8.tar forums-d4a2bec8d3c83b3e10ed128875acef886c908cd8.tar.gz forums-d4a2bec8d3c83b3e10ed128875acef886c908cd8.tar.bz2 forums-d4a2bec8d3c83b3e10ed128875acef886c908cd8.tar.xz forums-d4a2bec8d3c83b3e10ed128875acef886c908cd8.zip | |
- proper redirect after deleting a report [Bug #2260]
- sql_escape words before fulltext update
- correct language string for "search facilities" in acp_search
git-svn-id: file:///svn/phpbb/trunk@6075 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rwxr-xr-x | phpBB/includes/mcp/mcp_reports.php | 9 | ||||
| -rwxr-xr-x | phpBB/includes/search/fulltext_native.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/search.php | 2 |
3 files changed, 10 insertions, 3 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)) { diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php index cfb3f19504..ab6e55a0d4 100644 --- a/phpBB/language/en/acp/search.php +++ b/phpBB/language/en/acp/search.php @@ -84,7 +84,7 @@ $lang = array_merge($lang, array( 'TOTAL_MATCHES' => 'Total number of word to post relations indexed', 'YES_SEARCH' => 'Enable search facilities', - 'YES_SEARCH_EXPLAIN' => 'User and backend search functions including fulltext updates when posting.', + 'YES_SEARCH_EXPLAIN' => 'Enables user facing search functionality including member search.', 'YES_SEARCH_UPDATE' => 'Enable fulltext updating', 'YES_SEARCH_UPDATE_EXPLAIN' => 'Updating of fulltext indexes when posting, overriden if search is disabled.', )); |