Move config image opacity cast to setWatermarkImageOpacity method (Op…

…enMage#3727)
Tomasz-Silpion · Jan 10, 2024 · c982305 · c982305
1 parent 29e91f7
commit c982305
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php
@@ -143,7 +143,7 @@ public function init(Mage_Catalog_Model_Product $product, $attributeName, $image
             Mage::getStoreConfig("design/watermark/{$this->_getModel()->getDestinationSubdir()}_image")
         );
         $this->setWatermarkImageOpacity(
-            (int) Mage::getStoreConfig("design/watermark/{$this->_getModel()->getDestinationSubdir()}_imageOpacity")
+            Mage::getStoreConfig("design/watermark/{$this->_getModel()->getDestinationSubdir()}_imageOpacity")
         );
         $this->setWatermarkPosition(
             Mage::getStoreConfig("design/watermark/{$this->_getModel()->getDestinationSubdir()}_position")
@@ -488,12 +488,12 @@ protected function getWatermarkSize()
     /**
      * Set watermark image opacity
      *
-     * @param int $imageOpacity
+     * @param int|string $imageOpacity
      * @return $this
      */
     public function setWatermarkImageOpacity($imageOpacity)
     {
-        $this->_watermarkImageOpacity = $imageOpacity;
+        $this->_watermarkImageOpacity = (int) $imageOpacity;
         $this->_getModel()->setWatermarkImageOpacity($imageOpacity);
         return $this;
     }

diff --git a/app/code/core/Mage/Catalog/Model/Product/Image.php b/app/code/core/Mage/Catalog/Model/Product/Image.php
@@ -693,12 +693,12 @@ public function getWatermarkPosition()
     /**
      * Set watermark image opacity
      *
-     * @param int $imageOpacity
+     * @param int|string $imageOpacity
      * @return $this
      */
     public function setWatermarkImageOpacity($imageOpacity)
     {
-        $this->_watermarkImageOpacity = $imageOpacity;
+        $this->_watermarkImageOpacity = (int) $imageOpacity;
         return $this;
     }