fix missing image properties

heimrichhannot · Oct 13, 2023 · 544e79f · 544e79f
1 parent 89c0b05
commit 544e79f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.230.1] - 2023-10-13
+- Fixed: missing image custom properties
+
 ## [2.230.0] - 2023-10-12
 - Added: AuthorField class as new mechanic to add author field
 - Deprecated: DcaUtil::addAuthorFieldAndCallback()

diff --git a/src/Twig/ImageExtension.php b/src/Twig/ImageExtension.php
@@ -76,7 +76,6 @@ public function getImage($image, $size = null, array $data = [], string $templat
      */
     public function getImageData($image, $size = null, array $data = []): array
     {
-        // $imageData = [];
 
         $data['singleSRC'] = $image;
         $size = $data['size'] = \is_array($size) ? $size : StringUtil::deserialize($size);
@@ -86,8 +85,6 @@ public function getImageData($image, $size = null, array $data = []): array
             unset($data['size']);
         }
 
-        // $this->container->get('huh.utils.image')->addToTemplateData('image', 'addImage', $imageData, $data);
-
         $fileModel = null;
 
         if (Validator::isUuid($image))
@@ -109,21 +106,11 @@ public function getImageData($image, $size = null, array $data = []): array
             $template->picture = $picture;
         }
 
-        return $template->getData();
-
-        /*
-        if (empty($imageData)) {
-            return [];
-        }
+        $templateData = $template->getData();
+        // merge the rest of the custom configs
+        $templateData = array_merge($templateData, $data);
 
-        $result = array_merge($imageData, $data);
-
-        if (isset($imageData['picture']) && isset($data['picture'])) {
-            $result['picture'] = array_merge($imageData['picture'], $data['picture']);
-        }
-
-        return $result;
-        */
+        return $templateData;
     }
 
     /**