[BUGFIX] Fix regression which required a startingpoint to be always s…

…et, see #257
tpwd · Nov 15, 2024 · e8eb8dd · e8eb8dd
1 parent 8bf56bd
commit e8eb8dd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,8 @@
 ChangeLog
 
+Upcoming version
+[BUGFIX]  Fix regression which required a startingpoint to be always set. https://github.com/tpwd/ke_search/issues/257
+
 Version 6.1.1, 25 October 2024
 [BUGFIX]  Fix regression in composer.json which removes TYPO3 13 requirement
 

diff --git a/Classes/Lib/Db.php b/Classes/Lib/Db.php
@@ -509,6 +509,11 @@ public function getWhere()
         $where .= $this->createQueryForDateRange();
 
         // restrict to storage page
+        if (empty($this->pObj->startingPoints)) {
+            throw new \Exception('No starting point found. Please set the starting point in the plugin'
+                . ' configuration or via TypoScript: '
+                . 'https://docs.typo3.org/p/tpwd/ke_search/main/en-us/Configuration/OverrideRecordStoragePage.html.');
+        }
         $startingPoints = $this->pObj->pi_getPidList($this->pObj->startingPoints);
         $where .= ' AND pid in (' . $startingPoints . ') ';
 

diff --git a/Classes/Lib/PluginBaseHelper.php b/Classes/Lib/PluginBaseHelper.php
@@ -85,12 +85,6 @@ public function getStartingPoint(): string
             $startingpoint['recursive'] = $this->pObj->conf['overrideStartingPointRecursive'] ?? 0;
         }
 
-        if (empty($startingpoint['pages'])) {
-            throw new \Exception('No starting point found. Please set the starting point in the plugin'
-                . ' configuration or via TypoScript: '
-                . 'https://docs.typo3.org/p/tpwd/ke_search/main/en-us/Configuration/OverrideRecordStoragePage.html.');
-        }
-
         return $this->pObj->pi_getPidList($startingpoint['pages'], $startingpoint['recursive']);
     }