diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-08-10 02:42:47 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-08-10 02:42:47 -0400 |
| commit | 9ad1e41b4b3590e0ae92d404dbe6cb396102ec6a (patch) | |
| tree | d2ae26eba628163f63c48cb8cb1e3789366bf246 /phpBB/includes | |
| parent | 4b8eac02f06d2a4c71908881ce47639525cf59df (diff) | |
| parent | 698b7999c4dd389c7d0e970f72e4a594fc99dd5a (diff) | |
| download | forums-9ad1e41b4b3590e0ae92d404dbe6cb396102ec6a.tar forums-9ad1e41b4b3590e0ae92d404dbe6cb396102ec6a.tar.gz forums-9ad1e41b4b3590e0ae92d404dbe6cb396102ec6a.tar.bz2 forums-9ad1e41b4b3590e0ae92d404dbe6cb396102ec6a.tar.xz forums-9ad1e41b4b3590e0ae92d404dbe6cb396102ec6a.zip | |
Merge PR #944 branch 'dhruvgoel92/ticket/11032' into develop
* dhruvgoel92/ticket/11032:
[ticket/11032] trigger error in case search fails
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/search/fulltext_sphinx.php | 8 |
1 files changed, 8 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, |