aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDhruv <dhruv.goel92@gmail.com>2012-07-12 17:48:17 +0530
committerDhruv <dhruv.goel92@gmail.com>2012-07-19 23:01:49 +0530
commit609ce3ae8fb55e717ff188d2ec9c10c6ae252b7a (patch)
treeb13a63286943e2fb09ebd455d689c1f306636c56
parent81959927e53ebc62765ff075d23feeaf9b40a95d (diff)
downloadforums-609ce3ae8fb55e717ff188d2ec9c10c6ae252b7a.tar
forums-609ce3ae8fb55e717ff188d2ec9c10c6ae252b7a.tar.gz
forums-609ce3ae8fb55e717ff188d2ec9c10c6ae252b7a.tar.bz2
forums-609ce3ae8fb55e717ff188d2ec9c10c6ae252b7a.tar.xz
forums-609ce3ae8fb55e717ff188d2ec9c10c6ae252b7a.zip
[feature/sphinx-fulltext-search] add pgsql functionality
PHPBB3-10946
-rw-r--r--phpBB/includes/search/fulltext_sphinx.php2
-rw-r--r--phpBB/language/en/acp/search.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index d82a56c6f4..76caf9ae8c 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -108,7 +108,7 @@ class phpbb_search_fulltext_sphinx
*/
function init()
{
- if ($this->db->sql_layer != 'mysql' && $this->db->sql_layer != 'mysql4' && $this->db->sql_layer != 'mysqli')
+ if ($this->db->sql_layer != 'mysql' && $this->db->sql_layer != 'mysql4' && $this->db->sql_layer != 'mysqli' && $this->db->sql_layer != 'postgres')
{
return $this->user->lang['FULLTEXT_SPHINX_WRONG_DATABASE'];
}
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php
index 970d9cd41b..4aa9c89cde 100644
--- a/phpBB/language/en/acp/search.php
+++ b/phpBB/language/en/acp/search.php
@@ -80,7 +80,7 @@ $lang = array_merge($lang, array(
'FULLTEXT_SPHINX_MAIN_POSTS' => 'Number of posts in main index',
'FULLTEXT_SPHINX_PORT' => 'Sphinx search deamon port',
'FULLTEXT_SPHINX_PORT_EXPLAIN' => 'Port on which the sphinx search deamon on localhost listens. Leave empty to use the default 3312',
- 'FULLTEXT_SPHINX_WRONG_DATABASE' => 'The sphinx plugin for phpBB currently only supports MySQL',
+ 'FULLTEXT_SPHINX_WRONG_DATABASE' => 'The sphinx search for phpBB supports MySQL and PostgreSQL only.',
'FULLTEXT_SPHINX_STOPWORDS_FILE' => 'Stopwords activated',
'FULLTEXT_SPHINX_STOPWORDS_FILE_EXPLAIN' => 'You can place a file called sphinx_stopwords.txt containing one word in each line in your config directory. If this file is present these words will be excluded from the indexing process.',
'FULLTEXT_SPHINX_CONFIG_FILE' => 'Sphinx config file',