aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/search/fulltext_sphinx.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-10-13 12:29:34 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-10-13 12:29:34 +0200
commit8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a (patch)
tree14dfe3014300268e2f775f86075fd89d5552a004 /phpBB/phpbb/search/fulltext_sphinx.php
parent6f48b3c044a5339bc019f355db490e1a53b51fdc (diff)
parente8b4304c1bbe35784b4cac5dd4059d6a4ac2dcac (diff)
downloadforums-8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a.tar
forums-8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a.tar.gz
forums-8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a.tar.bz2
forums-8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a.tar.xz
forums-8c2d0c8c3639bbfc2799d372cc7aafcb62fc4b8a.zip
Merge pull request #5708 from marc1706/ticket/16051
[ticket/16051] Remove mysql driver as it's no longer supported in PHP >= 7.0
Diffstat (limited to 'phpBB/phpbb/search/fulltext_sphinx.php')
-rw-r--r--phpBB/phpbb/search/fulltext_sphinx.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php
index d8331d3815..6230f92da3 100644
--- a/phpBB/phpbb/search/fulltext_sphinx.php
+++ b/phpBB/phpbb/search/fulltext_sphinx.php
@@ -214,7 +214,7 @@ class fulltext_sphinx
*/
public function init()
{
- 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')
+ if ($this->db->get_sql_layer() != 'mysqli' && $this->db->get_sql_layer() != 'postgres')
{
return $this->user->lang['FULLTEXT_SPHINX_WRONG_DATABASE'];
}
@@ -233,7 +233,7 @@ class fulltext_sphinx
protected function config_generate()
{
// Check if Database is supported by Sphinx
- if ($this->db->get_sql_layer() =='mysql' || $this->db->get_sql_layer() == 'mysql4' || $this->db->get_sql_layer() == 'mysqli')
+ if ($this->db->get_sql_layer() == 'mysqli')
{
$this->dbtype = 'mysql';
}