makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- proper redirect after deleting a report [Bug #2260]

Browse source 
- 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
This commit is contained in:
Nils Adermann 2006-06-16 18:31:51 +00:00
parent 010e453b45
commit d4a2bec8d3
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/includes/mcp/mcp_reports.php
View file

@ -352,7 +352,14 @@ function close_report($post_id_list, $mode, $action)
trigger_error('NOT_AUTHORIZED'); 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 = ''; $success_msg = '';
$s_hidden_fields = build_hidden_fields(array( $s_hidden_fields = build_hidden_fields(array(

2
phpBB/includes/search/fulltext_native.php
View file

@ -825,7 +825,7 @@ class fulltext_native extends search_backend
} }
$db->sql_freeresult($result); $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)) if (sizeof($new_words))
{ {

2
phpBB/language/en/acp/search.php
View file

@ -84,7 +84,7 @@ $lang = array_merge($lang, array(
'TOTAL_MATCHES' => 'Total number of word to post relations indexed', 'TOTAL_MATCHES' => 'Total number of word to post relations indexed',
'YES_SEARCH' => 'Enable search facilities', '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' => 'Enable fulltext updating',
'YES_SEARCH_UPDATE_EXPLAIN' => 'Updating of fulltext indexes when posting, overriden if search is disabled.', 'YES_SEARCH_UPDATE_EXPLAIN' => 'Updating of fulltext indexes when posting, overriden if search is disabled.',
)); ));