diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-12-06 13:42:55 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-12-06 13:42:55 +0100 |
| commit | f0c6c4db15d49a2a44845056ce9e5e7ce1cc54d6 (patch) | |
| tree | 9c19acb0a999e00c0e35498e7c557baba23c0447 | |
| parent | 319efb026d29adbb9cc50da9641ea07304b9bb2d (diff) | |
| parent | 7fbf5649eb02a0341e1eed0247e105f21fcdddf4 (diff) | |
| download | forums-f0c6c4db15d49a2a44845056ce9e5e7ce1cc54d6.tar forums-f0c6c4db15d49a2a44845056ce9e5e7ce1cc54d6.tar.gz forums-f0c6c4db15d49a2a44845056ce9e5e7ce1cc54d6.tar.bz2 forums-f0c6c4db15d49a2a44845056ce9e5e7ce1cc54d6.tar.xz forums-f0c6c4db15d49a2a44845056ce9e5e7ce1cc54d6.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/language/en/search.php | 1 | ||||
| -rw-r--r-- | phpBB/search.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index ec5dd99eb8..13e5bf7a97 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -71,6 +71,7 @@ $lang = array_merge($lang, array( '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_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( 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.', diff --git a/phpBB/search.php b/phpBB/search.php index e80a89b382..2598e407cc 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -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']))) { $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 |