diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2012-08-10 10:46:32 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2012-08-10 10:46:32 +0530 |
| commit | 698b7999c4dd389c7d0e970f72e4a594fc99dd5a (patch) | |
| tree | d2ae26eba628163f63c48cb8cb1e3789366bf246 | |
| parent | 4b8eac02f06d2a4c71908881ce47639525cf59df (diff) | |
| download | forums-698b7999c4dd389c7d0e970f72e4a594fc99dd5a.tar forums-698b7999c4dd389c7d0e970f72e4a594fc99dd5a.tar.gz forums-698b7999c4dd389c7d0e970f72e4a594fc99dd5a.tar.bz2 forums-698b7999c4dd389c7d0e970f72e4a594fc99dd5a.tar.xz forums-698b7999c4dd389c7d0e970f72e4a594fc99dd5a.zip | |
[ticket/11032] trigger error in case search fails
Admins are shown actual error while users are shown a search failed error
in case sphinx search fails.
PHPBB3-11032
| -rw-r--r-- | phpBB/includes/search/fulltext_sphinx.php | 8 | ||||
| -rw-r--r-- | phpBB/language/en/search.php | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php index 5f4a0deaa0..fa7bd01f39 100644 --- a/phpBB/includes/search/fulltext_sphinx.php +++ b/phpBB/includes/search/fulltext_sphinx.php @@ -495,6 +495,14 @@ class phpbb_search_fulltext_sphinx if ($this->sphinx->GetLastError()) { add_log('critical', 'LOG_SPHINX_ERROR', $this->sphinx->GetLastError()); + if ($this->auth->acl_get('a_')) + { + trigger_error($this->user->lang('SPHINX_SEARCH_FAILED', $this->sphinx->GetLastError())); + } + else + { + trigger_error($this->user->lang('SPHINX_SEARCH_FAILED', $this->user->lang('SPHINX_SEARCH_ERROR_LOG'))); + } } // Could be connection to localhost:9312 failed (errno=111, diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index d09b4303cd..5eea6044bc 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -105,6 +105,8 @@ $lang = array_merge($lang, array( 'SORT_FORUM' => 'Forum', 'SORT_POST_SUBJECT' => 'Post subject', 'SORT_TIME' => 'Post time', + 'SPHINX_SEARCH_FAILED' => 'Search failed. %s', + 'SPHINX_SEARCH_ERROR_LOG' => 'The error information has been logged.', 'TOO_FEW_AUTHOR_CHARS' => array( 1 => 'You must specify at least %d character of the authors name.', |