[RELEASE] Version 12.5.9 Bugfixes

Author: tinzog

CHANGELOG.md

@@ -1,6 +1,11 @@
 # In2publish Core Change Log
 
+12.5.9:
+- [META] Set the EM conf version number to 12.5.9
+- [BUGFIX] Avoid trailing AND when additionalWhere is empty
+
 12.5.8
+- [META] Set the EM conf version number to 12.5.8
 - [BUGFIX] Fix publishing of deleted related records
 - [BUGFIX] Remove all additional entries from RecordIndex if there is more than one entry
 - [TEST] Correct Tests for new SQL data

Classes/Component/Core/PreProcessing/PreProcessor/SelectProcessor.php

@@ -89,12 +89,12 @@ protected function buildResolver(string $table, string $column, array $processed
             }
             $additionalWhere = implode(' AND ', $foreignMatchFields);
             if (1 === preg_match(AbstractProcessor::ADDITIONAL_ORDER_BY_PATTERN, $foreignTableWhere, $matches) && !empty($matches['where'])) {
-                $foreignTableWhere = implode(' AND ', [$matches['where'], $additionalWhere]);
+                $foreignTableWhere = implode(' AND ', array_filter([$matches['where'], $additionalWhere]));
                 if (!empty($matches['col'])) {
                     $foreignTableWhere .= ' ORDER BY ' . $matches['col'] . ($matches['dir'] ?? '');
                 }
             } else {
-                $foreignTableWhere = implode(' AND ', [$foreignTableWhere, $additionalWhere]);
+                $foreignTableWhere = implode(' AND ', array_filter([$foreignTableWhere, $additionalWhere]));
             }
             $foreignTableWhere = DatabaseUtility::stripLogicalOperatorPrefix($foreignTableWhere);
             $foreignTableWhere = $this->tcaEscapingMarkerService->escapeMarkedIdentifier($foreignTableWhere);

ext_emconf.php

@@ -9,7 +9,7 @@
     'title' => 'in2publish Core',
     'description' => 'Content publishing extension to connect stage and production server',
     'category' => 'plugin',
-    'version' => '12.5.8',
+    'version' => '12.5.9',
     'state' => 'stable',
     'clearCacheOnLoad' => true,
     'author' => 'Alex Kellner, Oliver Eglseder, Thomas Scheibitz, Stefan Busemann',