Merge pull request #43 from cloudinary/v1.10.1

V1.10.1
cloudinary · Oct 23, 2019 · 1446635 · 1446635
2 parents c586356 + 2ab7ae9
commit 1446635
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -88,8 +88,8 @@ public function getCloudinaryMediaLibraryWidgetOptions($multiple = true, $refres
      */
     public function escapeHtmlAttr($string, $escapeSingleQuote = true)
     {
-        if (method_exists(get_parent_class($this), 'escapeHtmlAttr')) {
-            return parent::escapeHtmlAttr($string, $escapeSingleQuote);
+        if (method_exists($this->_escaper, 'escapeHtmlAttr')) {
+            return $this->_escaper->escapeHtmlAttr($string, $escapeSingleQuote);
         }
         if ($escapeSingleQuote) {
             $escaper = new \Zend\Escaper\Escaper();

diff --git a/Model/Config/Source/Dropdown/ProductGallery/ZoomType.php b/Model/Config/Source/Dropdown/ProductGallery/ZoomType.php
@@ -18,8 +18,8 @@ public function toOptionArray()
                 'label' => 'Flyout',
             ],
             [
-                'value' => 'lightbox',
-                'label' => 'Lightbox',
+                'value' => 'popup',
+                'label' => 'Popup',
             ],
         ];
     }

diff --git a/Model/Configuration.php b/Model/Configuration.php
@@ -199,7 +199,7 @@ public function getCdnSubdomainStatus()
      */
     public function getUserPlatform()
     {
-        return sprintf(self::USER_PLATFORM_TEMPLATE, '1.10.0', '2.0.0');
+        return sprintf(self::USER_PLATFORM_TEMPLATE, '1.10.1', '2.0.0');
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary-magento2",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.10.0",
+    "version": "1.10.1",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": "*"

diff --git a/etc/module.xml b/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.10.0">
+  <module name="Cloudinary_Cloudinary" setup_version="1.10.1">
       <sequence>
           <module name="Magento_ProductVideo"/>
       </sequence>

diff --git a/marketplace.composer.json b/marketplace.composer.json
@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.10.0",
+    "version": "1.10.1",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": "*"