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

Merge branch 'ticket/13400' into develop-ascraeus

Browse source
This commit is contained in:
Joas Schilling 2014-12-06 13:42:24 +01:00
commit 7fbf5649eb
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/language/en/search.php
View file

@ -71,6 +71,7 @@ $lang = array_merge($lang, array(
'NO_RECENT_SEARCHES' => 'No searches have been carried out recently.', 'NO_RECENT_SEARCHES' => 'No searches have been carried out recently.',
'NO_SEARCH' => 'Sorry but you are not permitted to use the search system.', 'NO_SEARCH' => 'Sorry but you are not permitted to use the search system.',
'NO_SEARCH_RESULTS' => 'No suitable matches were found.', 'NO_SEARCH_RESULTS' => 'No suitable matches were found.',
'NO_SEARCH_LOAD' => 'Sorry but you cannot use search at this time. The server has high load. Please try again later.',
'NO_SEARCH_TIME' => array( 'NO_SEARCH_TIME' => array(
1 => 'Sorry but you cannot use search at this time. Please try again in %d second.', 1 => 'Sorry but you cannot use search at this time. Please try again in %d second.',
2 => 'Sorry but you cannot use search at this time. Please try again in %d seconds.', 2 => 'Sorry but you cannot use search at this time. Please try again in %d seconds.',

2
phpBB/search.php
View file

@ -101,7 +101,7 @@ if (!$auth->acl_get('u_search') || !$auth->acl_getf_global('f_search') || !$conf
if ($user->load && $config['limit_search_load'] && ($user->load > doubleval($config['limit_search_load']))) if ($user->load && $config['limit_search_load'] && ($user->load > doubleval($config['limit_search_load'])))
{ {
$template->assign_var('S_NO_SEARCH', true); $template->assign_var('S_NO_SEARCH', true);
trigger_error('NO_SEARCH_TIME'); trigger_error('NO_SEARCH_LOAD');
} }
// It is applicable if the configuration setting is non-zero, and the user cannot // It is applicable if the configuration setting is non-zero, and the user cannot