aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/search
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-08-18 22:26:58 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2012-08-18 22:26:58 -0400
commit89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91 (patch)
treeca2824fe9a4edbcb7b2a7de6289782b01008672d /phpBB/includes/search
parentd07cb6d778c264cbd1441438f2ea77ae6cc76126 (diff)
parentd4f1e71d5eca1204880de3199245e0167ac7f3f6 (diff)
downloadforums-89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91.tar
forums-89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91.tar.gz
forums-89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91.tar.bz2
forums-89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91.tar.xz
forums-89d334ee6af75d0f30f6e5d5cbca1e1a3980ad91.zip
Merge PR #954 branch 'dhruvgoel92/ticket/11032' into develop
* dhruvgoel92/ticket/11032: [ticket/11032] fix language of error displayed
Diffstat (limited to 'phpBB/includes/search')
-rw-r--r--phpBB/includes/search/fulltext_sphinx.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index 1a3bbe23db..288c0b5940 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -500,7 +500,7 @@ class phpbb_search_fulltext_sphinx
}
else
{
- trigger_error($this->user->lang('SPHINX_SEARCH_FAILED', $this->user->lang('SPHINX_SEARCH_ERROR_LOG')));
+ trigger_error($this->user->lang('SPHINX_SEARCH_FAILED_LOG'));
}
}