Tentative de régler le bordel

phpbb/search/fulltext_native.php

@@ -109,6 +109,12 @@ class fulltext_native extends \phpbb\search\base
 	* Initialises the fulltext_native search backend with min/max word length
 	*
 	* @param	boolean|string	&$error	is passed by reference and should either be set to false on success or an error message on failure
+	* @param	string	$phpbb_root_path	phpBB root path
+	* @param	string	$phpEx	PHP file extension
+	* @param	\phpbb\auth\auth	$auth	Auth object
+	* @param	\phpbb\config\config	$config	Config object
+	* @param	\phpbb\db\driver\driver_interface	$db	Database object
+	* @param	\phpbb\user	$user	User object
 	* @param	\phpbb\event\dispatcher_interface	$phpbb_dispatcher	Event dispatcher object
 	*/
 	public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user, $phpbb_dispatcher)
@@ -351,7 +357,7 @@ class fulltext_native extends \phpbb\search\base
 			$this->db->sql_freeresult($result);
 		}
 
-		// Handle +, - without preceeding whitespace character
+		// Handle +, - without preceding whitespace character
 		$match		= array('#(\S)\+#', '#(\S)-#');
 		$replace	= array('$1 +', '$1 +');
 
@@ -782,6 +788,8 @@ class fulltext_native extends \phpbb\search\base
 		$must_not_contain_ids = $this->must_not_contain_ids;
 		$must_contain_ids = $this->must_contain_ids;
 
+		$sql_sort_table = $sql_sort_join = $sql_match = $sql_match_where = $sql_sort = '';
+
 		/**
 		* Allow changing the query used for counting for posts using fulltext_native
 		*
@@ -889,7 +897,6 @@ class fulltext_native extends \phpbb\search\base
 
 			switch ($this->db->get_sql_layer())
 			{
-				case 'mysql4':
 				case 'mysqli':
 
 					// 3.x does not support SQL_CALC_FOUND_ROWS
@@ -1184,7 +1191,6 @@ class fulltext_native extends \phpbb\search\base
 		{
 			switch ($this->db->get_sql_layer())
 			{
-				case 'mysql4':
 				case 'mysqli':
 //					$select = 'SQL_CALC_FOUND_ROWS ' . $select;
 					$is_mysql = true;