1 files changed, 13 insertions, 32 deletions
diff --git a/phpBB/phpbb/search/fulltext_mysql.php b/phpBB/phpbb/search/fulltext_mysql.php
index a1e1b089b9..e5b0c89cb6 100644
--- a/phpBB/phpbb/search/fulltext_mysql.php
+++ b/phpBB/phpbb/search/fulltext_mysql.php
@@ -7,20 +7,14 @@
 *
 */
 
-/**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
+namespace phpbb\search;
 
 /**
 * fulltext_mysql
 * Fulltext search for MySQL
 * @package search
 */
-class phpbb_search_fulltext_mysql extends phpbb_search_base
+class fulltext_mysql extends \phpbb\search\base
 {
 	/**
 	 * Associative array holding index stats
@@ -36,19 +30,19 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 
 	/**
 	 * Config object
-	 * @var phpbb_config
+	 * @var \phpbb\config\config
 	 */
 	protected $config;
-	
+
 	/**
 	 * Database connection
-	 * @var phpbb_db_driver
+	 * @var \phpbb\db\driver\driver_interface
 	 */
 	protected $db;
-	
+
 	/**
 	 * User object
-	 * @var phpbb_user
+	 * @var \phpbb\user
 	 */
 	protected $user;
 
@@ -74,7 +68,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 
 	/**
 	 * Constructor
-	 * Creates a new phpbb_search_fulltext_mysql, which is used as a search backend
+	 * Creates a new \phpbb\search\fulltext_mysql, which is used as a search backend
 	 *
 	 * @param string|bool $error Any error that occurs is passed on through this reference variable otherwise false
 	 */
@@ -222,7 +216,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 		// We limit the number of allowed keywords to minimize load on the database
 		if ($this->config['max_num_search_keywords'] && sizeof($this->split_words) > $this->config['max_num_search_keywords'])
 		{
-			trigger_error($this->user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', $this->config['max_num_search_keywords'], sizeof($this->split_words)));
+			trigger_error($this->user->lang('MAX_NUM_SEARCH_KEYWORDS_REFINE', (int) $this->config['max_num_search_keywords'], sizeof($this->split_words)));
 		}
 
 		// to allow phrase search, we need to concatenate quoted words
@@ -779,7 +773,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			$alter[] = 'ADD FULLTEXT (post_subject)';
 		}
 
-		if (!isset($this->stats['post_text']))
+		if (!isset($this->stats['post_content']))
 		{
 			if ($this->db->sql_layer == 'mysqli' || version_compare($this->db->sql_server_info(true), '4.1.3', '>='))
 			{
@@ -789,12 +783,8 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			{
 				$alter[] = 'MODIFY post_text mediumtext NOT NULL';
 			}
-			$alter[] = 'ADD FULLTEXT (post_text)';
-		}
 
-		if (!isset($this->stats['post_content']))
-		{
-			$alter[] = 'ADD FULLTEXT post_content (post_subject, post_text)';
+			$alter[] = 'ADD FULLTEXT post_content (post_text, post_subject)';
 		}
 
 		if (sizeof($alter))
@@ -832,11 +822,6 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			$alter[] = 'DROP INDEX post_subject';
 		}
 
-		if (isset($this->stats['post_text']))
-		{
-			$alter[] = 'DROP INDEX post_text';
-		}
-
 		if (isset($this->stats['post_content']))
 		{
 			$alter[] = 'DROP INDEX post_content';
@@ -862,7 +847,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			$this->get_stats();
 		}
 
-		return (isset($this->stats['post_text']) && isset($this->stats['post_subject']) && isset($this->stats['post_content'])) ? true : false;
+		return isset($this->stats['post_subject']) && isset($this->stats['post_content']);
 	}
 
 	/**
@@ -902,11 +887,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 
 			if ($index_type == 'FULLTEXT')
 			{
-				if ($row['Key_name'] == 'post_text')
-				{
-					$this->stats['post_text'] = $row;
-				}
-				else if ($row['Key_name'] == 'post_subject')
+				if ($row['Key_name'] == 'post_subject')
 				{
 					$this->stats['post_subject'] = $row;
 				}