From 0496fe5c79224bf5068ca29a835bd6df6300e977 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 19 Sep 2014 17:22:11 +0200 Subject: [PATCH] Fixed an issue with the ISearchIndex::getInnerJoin() method --- .../install/files/lib/system/search/ISearchEngine.class.php | 5 +++-- .../lib/system/search/mysql/MysqlSearchEngine.class.php | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) 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 ); } -- 2.20.1