4 files changed, 74 insertions, 15 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 58a4dd7d6a..324c214e91 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -41,8 +41,8 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 	protected $config;
 	
 	/**
-	 * DBAL object
-	 * @var dbal
+	 * Database connection
+	 * @var phpbb_db_driver
 	 */
 	protected $db;
 	
@@ -86,6 +86,14 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 
 		$this->word_length = array('min' => $this->config['fulltext_mysql_min_word_len'], 'max' => $this->config['fulltext_mysql_max_word_len']);
 
+		/**
+		 * Load the UTF tools
+		 */
+		if (!function_exists('utf8_strlen'))
+		{
+			include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
+		}
+
 		$error = false;
 	}
 
@@ -230,7 +238,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base
 			}
 			else
 			{
-				$tmp_split_words[] = $word . ' ';
+				$tmp_split_words[] = $word;
 			}
 		}
 		if ($phrase)
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php
index 4623326fc7..53df8348ae 100644
--- a/phpBB/includes/search/fulltext_native.php
+++ b/phpBB/includes/search/fulltext_native.php
@@ -85,8 +85,8 @@ class phpbb_search_fulltext_native extends phpbb_search_base
 	protected $config;
 
 	/**
-	 * DBAL object
-	 * @var dbal
+	 * Database connection
+	 * @var phpbb_db_driver
 	 */
 	protected $db;
 
diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php
index 08f64735b6..1475cc31d0 100644
--- a/phpBB/includes/search/fulltext_postgres.php
+++ b/phpBB/includes/search/fulltext_postgres.php
@@ -66,8 +66,8 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 	protected $config;
 
 	/**
-	 * DBAL object
-	 * @var dbal
+	 * Database connection
+	 * @var phpbb_db_driver
 	 */
 	protected $db;
 
@@ -121,6 +121,14 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			}
 		}
 
+		/**
+		 * Load the UTF tools
+		 */
+		if (!function_exists('utf8_strlen'))
+		{
+			include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
+		}
+
 		$error = false;
 	}
 
@@ -468,10 +476,14 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			$tmp_sql_match[] = "to_tsvector ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', " . $sql_match_column . ") @@ to_tsquery ('" . $this->db->sql_escape($this->config['fulltext_postgres_ts_name']) . "', '" . $this->db->sql_escape($this->tsearch_query) . "')";
 		}
 
+		$this->db->sql_transaction('begin');
+
+		$sql_from = "FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p";
+		$sql_where = "WHERE (" . implode(' OR ', $tmp_sql_match) . ")
+			$sql_where_options";
 		$sql = "SELECT $sql_select
-			FROM $sql_from$sql_sort_table" . POSTS_TABLE . " p
-			WHERE (" . implode(' OR ', $tmp_sql_match) . ")
-			$sql_where_options
+			$sql_from
+			$sql_where
 			ORDER BY $sql_sort";
 		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
 
@@ -491,7 +503,12 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 		// if the total result count is not cached yet, retrieve it from the db
 		if (!$result_count)
 		{
-			$result_count = sizeof ($id_ary);
+			$sql_count = "SELECT COUNT(*) as result_count
+				$sql_from
+				$sql_where";
+			$result = $this->db->sql_query($sql_count);
+			$result_count = (int) $this->db->sql_fetchfield('result_count');
+			$this->db->sql_freeresult($result);
 
 			if (!$result_count)
 			{
@@ -499,6 +516,8 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			}
 		}
 
+		$this->db->sql_transaction('commit');
+
 		// store the ids, from start on then delete anything that isn't on the current page because we only need ids for one page
 		$this->save_ids($search_key, implode(' ', $this->split_words), $author_ary, $result_count, $id_ary, $start, $sort_dir);
 		$id_ary = array_slice($id_ary, 0, (int) $per_page);
@@ -639,6 +658,8 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			$field = 'topic_id';
 		}
 
+		$this->db->sql_transaction('begin');
+
 		// Only read one block of posts from the db and then cache it
 		$result = $this->db->sql_query_limit($sql, $this->config['search_block_size'], $start);
 
@@ -651,7 +672,35 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 		// retrieve the total result count if needed
 		if (!$result_count)
 		{
-			$result_count = sizeof ($id_ary);
+			if ($type == 'posts')
+			{
+				$sql_count = "SELECT COUNT(*) as result_count
+					FROM " . $sql_sort_table . POSTS_TABLE . ' p' . (($firstpost_only) ? ', ' . TOPICS_TABLE . ' t ' : ' ') . "
+					WHERE $sql_author
+						$sql_topic_id
+						$sql_firstpost
+						$m_approve_fid_sql
+						$sql_fora
+						$sql_sort_join
+						$sql_time";
+			}
+			else
+			{
+				$sql_count = "SELECT COUNT(*) as result_count
+					FROM " . $sql_sort_table . TOPICS_TABLE . ' t, ' . POSTS_TABLE . " p
+					WHERE $sql_author
+						$sql_topic_id
+						$sql_firstpost
+						$m_approve_fid_sql
+						$sql_fora
+						AND t.topic_id = p.topic_id
+						$sql_sort_join
+						$sql_time
+					GROUP BY t.topic_id, $sort_by_sql[$sort_key]";
+			}
+
+			$result = $this->db->sql_query($sql_count);
+			$result_count = (int) $this->db->sql_fetchfield('result_count');
 
 			if (!$result_count)
 			{
@@ -659,6 +708,8 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base
 			}
 		}
 
+		$this->db->sql_transaction('commit');
+
 		if (sizeof($id_ary))
 		{
 			$this->save_ids($search_key, '', $author_ary, $result_count, $id_ary, $start, $sort_dir);
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php
index dd5634b623..4bacf74f93 100644
--- a/phpBB/includes/search/fulltext_sphinx.php
+++ b/phpBB/includes/search/fulltext_sphinx.php
@@ -84,8 +84,8 @@ class phpbb_search_fulltext_sphinx
 	protected $config;
 
 	/**
-	 * DBAL object
-	 * @var dbal
+	 * Database connection
+	 * @var phpbb_db_driver
 	 */
 	protected $db;
 
@@ -875,7 +875,7 @@ class phpbb_search_fulltext_sphinx
 		</dl>
 		<dl>
 			<dt><label for="fulltext_sphinx_indexer_mem_limit">' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_INDEXER_MEM_LIMIT_EXPLAIN'] . '</span></dt>
-			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" />' . $this->user->lang['MIB'] . '</dd>
+			<dd><input id="fulltext_sphinx_indexer_mem_limit" type="text" size="4" maxlength="10" name="config[fulltext_sphinx_indexer_mem_limit]" value="' . $this->config['fulltext_sphinx_indexer_mem_limit'] . '" /> ' . $this->user->lang['MIB'] . '</dd>
 		</dl>
 		<dl>
 			<dt><label for="fulltext_sphinx_config_file">' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE'] . $this->user->lang['COLON'] . '</label><br /><span>' . $this->user->lang['FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN'] . '</dt>