diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-10-06 12:07:35 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-10-06 12:07:35 +0200 |
| commit | bd02c5bd085e957aa4341e7fc2df2199081ab069 (patch) | |
| tree | ea737eab62dc1f56bb3760542b0f27095f6eca64 /phpBB/phpbb/search/fulltext_mysql.php | |
| parent | 68c197fd6012b5435a29a288113b957e7957de59 (diff) | |
| download | forums-bd02c5bd085e957aa4341e7fc2df2199081ab069.tar forums-bd02c5bd085e957aa4341e7fc2df2199081ab069.tar.gz forums-bd02c5bd085e957aa4341e7fc2df2199081ab069.tar.bz2 forums-bd02c5bd085e957aa4341e7fc2df2199081ab069.tar.xz forums-bd02c5bd085e957aa4341e7fc2df2199081ab069.zip | |
[ticket/16051] Remove mysql driver as it's no longer supported in PHP >= 7.0
PHPBB3-16051
Diffstat (limited to 'phpBB/phpbb/search/fulltext_mysql.php')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_mysql.php | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php index 4d3e13663d..8bdc31e128 100644 --- a/phpBB/phpbb/search/fulltext_mysql.php +++ b/phpBB/phpbb/search/fulltext_mysql.php @@ -154,7 +154,7 @@ class fulltext_mysql extends \phpbb\search\base */ public function init() { - if ($this->db->get_sql_layer() != 'mysql4' && $this->db->get_sql_layer() != 'mysqli') + if ($this->db->get_sql_layer() != 'mysqli') { return $this->user->lang['FULLTEXT_MYSQL_INCOMPATIBLE_DATABASE']; } @@ -1005,14 +1005,7 @@ class fulltext_mysql extends \phpbb\search\base if (!isset($this->stats['post_subject'])) { $alter_entry = array(); - if ($this->db->get_sql_layer() == 'mysqli' || version_compare($this->db->sql_server_info(true), '4.1.3', '>=')) - { - $alter_entry[] = 'MODIFY post_subject varchar(255) COLLATE utf8_unicode_ci DEFAULT \'\' NOT NULL'; - } - else - { - $alter_entry[] = 'MODIFY post_subject text NOT NULL'; - } + $alter_entry[] = 'MODIFY post_subject varchar(255) COLLATE utf8_unicode_ci DEFAULT \'\' NOT NULL'; $alter_entry[] = 'ADD FULLTEXT (post_subject)'; $alter_list[] = $alter_entry; } @@ -1020,15 +1013,7 @@ class fulltext_mysql extends \phpbb\search\base if (!isset($this->stats['post_content'])) { $alter_entry = array(); - if ($this->db->get_sql_layer() == 'mysqli' || version_compare($this->db->sql_server_info(true), '4.1.3', '>=')) - { - $alter_entry[] = 'MODIFY post_text mediumtext COLLATE utf8_unicode_ci NOT NULL'; - } - else - { - $alter_entry[] = 'MODIFY post_text mediumtext NOT NULL'; - } - + $alter_entry[] = 'MODIFY post_text mediumtext COLLATE utf8_unicode_ci NOT NULL'; $alter_entry[] = 'ADD FULLTEXT post_content (post_text, post_subject)'; $alter_list[] = $alter_entry; } |