mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-06 14:35:56 +02:00
- 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
This commit is contained in:
parent
010e453b45
commit
d4a2bec8d3
@ -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(
|
||||
|
@ -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))
|
||||
{
|
||||
|
@ -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.',
|
||||
));
|
||||
|
Loading…
x
Reference in New Issue
Block a user