aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/search/fulltext_sphinx.php
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-06-26 17:17:35 +0200
committerTristan Darricau <github@nicofuma.fr>2014-06-26 21:09:19 +0200
commitff6e026a403a622bd1aa498bff396a737735faed (patch)
treef4a73eac80dff314b786117096eb6f82f86cd7d2 /phpBB/phpbb/search/fulltext_sphinx.php
parent9b27d00d5fc8228ec4f9150aa26bcf450dc45524 (diff)
downloadforums-ff6e026a403a622bd1aa498bff396a737735faed.tar
forums-ff6e026a403a622bd1aa498bff396a737735faed.tar.gz
forums-ff6e026a403a622bd1aa498bff396a737735faed.tar.bz2
forums-ff6e026a403a622bd1aa498bff396a737735faed.tar.xz
forums-ff6e026a403a622bd1aa498bff396a737735faed.zip
[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
PHPBB3-12446
Diffstat (limited to 'phpBB/phpbb/search/fulltext_sphinx.php')
-rw-r--r--phpBB/phpbb/search/fulltext_sphinx.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php
index 9008af338b..78c11f1180 100644
--- a/phpBB/phpbb/search/fulltext_sphinx.php
+++ b/phpBB/phpbb/search/fulltext_sphinx.php
@@ -199,7 +199,7 @@ class fulltext_sphinx
*/
public function init()
{
- if ($this->db->sql_layer != 'mysql' && $this->db->sql_layer != 'mysql4' && $this->db->sql_layer != 'mysqli' && $this->db->sql_layer != 'postgres')
+ if ($this->db->get_sql_layer() != 'mysql' && $this->db->get_sql_layer() != 'mysql4' && $this->db->get_sql_layer() != 'mysqli' && $this->db->get_sql_layer() != 'postgres')
{
return $this->user->lang['FULLTEXT_SPHINX_WRONG_DATABASE'];
}
@@ -218,11 +218,11 @@ class fulltext_sphinx
protected function config_generate()
{
// Check if Database is supported by Sphinx
- if ($this->db->sql_layer =='mysql' || $this->db->sql_layer == 'mysql4' || $this->db->sql_layer == 'mysqli')
+ if ($this->db->get_sql_layer() =='mysql' || $this->db->get_sql_layer() == 'mysql4' || $this->db->get_sql_layer() == 'mysqli')
{
$this->dbtype = 'mysql';
}
- else if ($this->db->sql_layer == 'postgres')
+ else if ($this->db->get_sql_layer() == 'postgres')
{
$this->dbtype = 'pgsql';
}