From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 19 Sep 2014 15:22:11 +0000 (+0200)
Subject: Fixed an issue with the ISearchIndex::getInnerJoin() method
X-Git-Tag: 2.1.0_Alpha_1~311^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0496fe5c79224bf5068ca29a835bd6df6300e977;p=GitHub%2FWoltLab%2FWCF.git

Fixed an issue with the ISearchIndex::getInnerJoin() method
---

diff --git a/wcfsetup/install/files/lib/system/search/ISearchEngine.class.php b/wcfsetup/install/files/lib/system/search/ISearchEngine.class.php
index 18e33c7923..a6104de905 100644
--- a/wcfsetup/install/files/lib/system/search/ISearchEngine.class.php
+++ b/wcfsetup/install/files/lib/system/search/ISearchEngine.class.php
@@ -21,11 +21,12 @@ interface ISearchEngine {
 	public function getConditionBuilderClassName();
 	
 	/**
-	 * Returns the inner join query and the condition parameters. This method is allowed to return NULL
-	 * for the 'fulltextCondition' index instead of a PreparedStatementConditionBuilder instance:
+	 * Returns the inner join query and the condition parameters. This method is allowed to return NULL for both the
+	 * 'fulltextCondition' and 'searchIndexCondition' index instead of a PreparedStatementConditionBuilder instance:
 	 * 
 	 * array(
 	 * 	'fulltextCondition' => $fulltextCondition || null,
+	 * 	'searchIndexCondition' => $searchIndexCondition || null,
 	 * 	'sql' => $sql
 	 * );
 	 * 
diff --git a/wcfsetup/install/files/lib/system/search/mysql/MysqlSearchEngine.class.php b/wcfsetup/install/files/lib/system/search/mysql/MysqlSearchEngine.class.php
index a8371e51f7..ef40b8fa73 100644
--- a/wcfsetup/install/files/lib/system/search/mysql/MysqlSearchEngine.class.php
+++ b/wcfsetup/install/files/lib/system/search/mysql/MysqlSearchEngine.class.php
@@ -121,6 +121,7 @@ class MysqlSearchEngine extends AbstractSearchEngine {
 		
 		return array(
 			'fulltextCondition' => $fulltextCondition,
+			'searchIndexCondition' => $searchIndexCondition,
 			'sql' => $sql
 		);
 	}