Fixed an issue with the ISearchIndex::getInnerJoin() method
authorAlexander Ebert <ebert@woltlab.com>
Fri, 19 Sep 2014 15:22:11 +0000 (17:22 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 19 Sep 2014 15:22:11 +0000 (17:22 +0200)
wcfsetup/install/files/lib/system/search/ISearchEngine.class.php
wcfsetup/install/files/lib/system/search/mysql/MysqlSearchEngine.class.php

index 18e33c79239b72abf93a437ec4e1ef5dc60841bb..a6104de90515fae11c556564911f82063ba9afca 100644 (file)
@@ -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
         * );
         * 
index a8371e51f7313c31546ffbca5e3e2a1f53fb5f35..ef40b8fa73b91b4bc38f9c7ab81c7b926bcab95a 100644 (file)
@@ -121,6 +121,7 @@ class MysqlSearchEngine extends AbstractSearchEngine {
                
                return array(
                        'fulltextCondition' => $fulltextCondition,
+                       'searchIndexCondition' => $searchIndexCondition,
                        'sql' => $sql
                );
        }