[BUGFIX] Fix regression in indexed search Extbase plugin 36/49736/2
authorTymoteusz Motylewski <t.motylewski@gmail.com>
Thu, 1 Sep 2016 21:31:04 +0000 (23:31 +0200)
committerMorton Jonuschat <m.jonuschat@mojocode.de>
Fri, 2 Sep 2016 07:59:22 +0000 (09:59 +0200)
Doctrine migration of indexed search https://review.typo3.org/49354
introduced a regression.

Resolves: #77767
Releases: master
Change-Id: Ie95d0845c9569acbd3d1a7891d6b37f7e2d17665
Reviewed-on: https://review.typo3.org/49736
Tested-by: Bamboo TYPO3com <info@typo3.com>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Tested-by: Morton Jonuschat <m.jonuschat@mojocode.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php

index d2d75eb..1610c30 100644 (file)
@@ -965,7 +965,7 @@ class IndexSearchRepository
                 QueryHelper::stripLogicalOperatorPrefix($this->mediaTypeWhere()),
                 QueryHelper::stripLogicalOperatorPrefix($this->languageWhere()),
                 QueryHelper::stripLogicalOperatorPrefix($this->freeIndexUidWhere($freeIndexUid)),
-                $queryBuilder->expr()->eq('IP.phash', $queryBuilder->quoteIdentifier('IR.phash'))
+                $queryBuilder->expr()->eq('ISEC.phash', $queryBuilder->quoteIdentifier('IP.phash'))
             )
             ->groupBy(
                 'IP.phash',
@@ -1015,7 +1015,7 @@ class IndexSearchRepository
             $queryBuilder->getRestrictions()->removeAll();
             $queryBuilder->from('pages');
             $queryBuilder->andWhere(
-                $queryBuilder->expr()->eq('pages.uid', $queryBuilder->quoteIdentifier('ISEC.page')),
+                $queryBuilder->expr()->eq('pages.uid', $queryBuilder->quoteIdentifier('ISEC.page_id')),
                 QueryHelper::stripLogicalOperatorPrefix($this->enableFields('pages')),
                 $queryBuilder->expr()->eq('pages.no_search', 0),
                 $queryBuilder->expr()->lt('pages.doktype', 200)