From 551a018613aa7588c4b261c8f7efbfab3aefb0a3 Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Thu, 2 Apr 2020 23:16:01 +0200
Subject: [PATCH 1/2] [ticket/16423] Add Aria Engine to list of Fulltext
Supported
PHPBB3-16423
---
phpBB/phpbb/search/fulltext_mysql.php | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php
index 1105d0892f..149c2f1c63 100644
--- a/phpBB/phpbb/search/fulltext_mysql.php
+++ b/phpBB/phpbb/search/fulltext_mysql.php
@@ -173,14 +173,16 @@ class fulltext_mysql extends \phpbb\search\base
$engine = $info['Type'];
}
- $fulltext_supported =
- $engine === 'MyISAM' ||
- // FULLTEXT is supported on InnoDB since MySQL 5.6.4 according to
- // http://dev.mysql.com/doc/refman/5.6/en/innodb-storage-engine.html
- // We also require https://bugs.mysql.com/bug.php?id=67004 to be
- // fixed for proper overall operation. Hence we require 5.6.8.
- $engine === 'InnoDB' &&
- phpbb_version_compare($this->db->sql_server_info(true), '5.6.8', '>=');
+ $fulltext_supported = ($engine === 'Aria' || $engine === 'MyISAM'
+ /**
+ * FULLTEXT is supported on InnoDB since MySQL 5.6.4 according to
+ * http://dev.mysql.com/doc/refman/5.6/en/innodb-storage-engine.html
+ * We also require https://bugs.mysql.com/bug.php?id=67004 to be
+ * fixed for proper overall operation. Hence we require 5.6.8.
+ */
+ || $engine === 'InnoDB'
+ && phpbb_version_compare($this->db->sql_server_info(true), '5.6.8', '>=')
+ );
if (!$fulltext_supported)
{
From c1904510981ba18f3d6af24aa75479ecd3bf230d Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Thu, 2 Apr 2020 23:46:54 +0200
Subject: [PATCH 2/2] [ticket/16423] Add Aria Engine to list of Fulltext
Supported
PHPBB3-16423
---
phpBB/phpbb/search/fulltext_mysql.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php
index 149c2f1c63..c7e4463c87 100644
--- a/phpBB/phpbb/search/fulltext_mysql.php
+++ b/phpBB/phpbb/search/fulltext_mysql.php
@@ -173,7 +173,7 @@ class fulltext_mysql extends \phpbb\search\base
$engine = $info['Type'];
}
- $fulltext_supported = ($engine === 'Aria' || $engine === 'MyISAM'
+ $fulltext_supported = $engine === 'Aria' || $engine === 'MyISAM'
/**
* FULLTEXT is supported on InnoDB since MySQL 5.6.4 according to
* http://dev.mysql.com/doc/refman/5.6/en/innodb-storage-engine.html
@@ -181,8 +181,7 @@ class fulltext_mysql extends \phpbb\search\base
* fixed for proper overall operation. Hence we require 5.6.8.
*/
|| $engine === 'InnoDB'
- && phpbb_version_compare($this->db->sql_server_info(true), '5.6.8', '>=')
- );
+ && phpbb_version_compare($this->db->sql_server_info(true), '5.6.8', '>=');
if (!$fulltext_supported)
{