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

Merge PR #944 branch 'dhruvgoel92/ticket/11032' into develop

Browse source 
* dhruvgoel92/ticket/11032:
  [ticket/11032] trigger error in case search fails
This commit is contained in:
Oleg Pudeyev 2012-08-10 02:42:47 -04:00
commit 9ad1e41b4b
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/search/fulltext_sphinx.php
View file

@ -495,6 +495,14 @@ class phpbb_search_fulltext_sphinx
if ($this->sphinx->GetLastError()) if ($this->sphinx->GetLastError())
{ {
add_log('critical', 'LOG_SPHINX_ERROR', $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, // Could be connection to localhost:9312 failed (errno=111,

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

@ -105,6 +105,8 @@ $lang = array_merge($lang, array(
'SORT_FORUM' => 'Forum', 'SORT_FORUM' => 'Forum',
'SORT_POST_SUBJECT' => 'Post subject', 'SORT_POST_SUBJECT' => 'Post subject',
'SORT_TIME' => 'Post time', '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( 'TOO_FEW_AUTHOR_CHARS' => array(
1 => 'You must specify at least %d character of the authors name.', 1 => 'You must specify at least %d character of the authors name.',