Merge pull request #81 from cloudinary/v1.14.6

V1.14.6

Author: Pniel (Pini) Cohen

Plugin/ImageHelper.php

@@ -138,10 +138,6 @@ public function aroundGetUrl(CatalogImageHelper $helper, \Closure $originalMetho
             return $originalMethod();
         }
 
-        if ($imageBlock->getImageUrl() === 'no_selection') {
-            return $imageBlock;
-        }
-
         $imagePath = $this->imageFile ?: $this->product->getData($helper->getType());
 
         $image = $this->imageFactory->build(sprintf('catalog/product%s', $imagePath), $originalMethod);

composer.json

@@ -2,10 +2,10 @@
     "name": "cloudinary/cloudinary-magento2",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.14.4",
+    "version": "1.14.6",
     "license": "MIT",
     "require": {
-        "cloudinary/cloudinary_php": "*"
+        "cloudinary/cloudinary_php": "^1.20.0"
     },
     "autoload": {
         "files": [

etc/csp_whitelist.xml

@@ -3,35 +3,41 @@
     <policies>
         <policy id="script-src">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
                 <value id="cloudinary_cloudflare_cdnjs" type="host">cdnjs.cloudflare.com</value>
             </values>
         </policy>
         <policy id="frame-src">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
                 <value id="cloudinary_cloudflare_cdnjs" type="host">cdnjs.cloudflare.com</value>
             </values>
         </policy>
         <policy id="connect-src">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
             </values>
         </policy>
         <policy id="form-action">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
             </values>
         </policy>
         <policy id="img-src">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
                 <value id="data" type="host">data:</value>
             </values>
         </policy>
         <policy id="style-src">
             <values>
-                <value id="cloudinary_main" type="host">*.cloudinary.com</value>
+                <value id="cloudinary_main" type="host">cloudinary.com</value>
+                <value id="cloudinary_wildcard" type="host">*.cloudinary.com</value>
             </values>
         </policy>
     </policies>

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Cloudinary_Cloudinary" setup_version="1.14.4">
+  <module name="Cloudinary_Cloudinary" setup_version="1.14.6">
       <sequence>
           <module name="Magento_ProductVideo"/>
           <module name="Magento_PageBuilder"/>

marketplace.composer.json

@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.14.4",
+    "version": "1.14.6",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": "*"