Merge branch '3.4' into 4.0

pimcore · Sep 14, 2023 · a3ec49f · a3ec49f
2 parents 9f82559 + bce18c7
commit a3ec49f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/ActivityStore/MariaDb.php b/src/ActivityStore/MariaDb.php
@@ -284,7 +284,8 @@ public function getActivitiesDataForWebservice($pageSize, $page, ExportActivitie
             ->addOrderBy('activityDate', 'asc');
 
         if ($ts = $params->getModifiedSinceTimestamp()) {
-            $select->where('modificationDate >= ?', $ts);
+            $select->where('modificationDate >= ?');
+            $select->setParameters([$ts]);
         }
 
         $paginator = $this->paginator->paginate($select, $page, $pageSize);

diff --git a/src/ActivityStore/MySQL.php b/src/ActivityStore/MySQL.php
@@ -151,7 +151,8 @@ public function getActivitiesDataForWebservice($pageSize, $page, ExportActivitie
             ->addOrderBy('activityDate', 'asc');
 
         if ($ts = $params->getModifiedSinceTimestamp()) {
-            $select->where('modificationDate >= ?', $ts);
+            $select->where('modificationDate >= ?');
+            $select->setParameters([$ts]);
         }
 
         $paginator = $this->paginator->paginate($select, $page, $pageSize);