From bdb3555db61b422a1f74333392f242c9ae7e4c44 Mon Sep 17 00:00:00 2001
From: pini-girit <pini@girit.biz>
Date: Thu, 10 Oct 2019 16:57:23 +0300
Subject: [PATCH 1/2] CLOUDINARY-212: ProductGalley - changed 'lightbox' to
 'popup'

---
 Model/Config/Source/Dropdown/ProductGallery/ZoomType.php | 4 ++--
 Model/Configuration.php                                  | 2 +-
 composer.json                                            | 2 +-
 etc/module.xml                                           | 2 +-
 marketplace.composer.json                                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Model/Config/Source/Dropdown/ProductGallery/ZoomType.php b/Model/Config/Source/Dropdown/ProductGallery/ZoomType.php
index ff5c441..ca33469 100644
--- 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
index 655c301..2f2f128 100644
--- 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
index b63b80a..c3bbe7c 100644
--- 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
index c67c0ad..6b9b861 100644
--- 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
index 2b02204..d87ccac 100644
--- 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": "*"

From 2ab7ae9d0ed938738cf30dae26ddefccf5ed987c Mon Sep 17 00:00:00 2001
From: pini-girit <pini@girit.biz>
Date: Tue, 15 Oct 2019 11:42:53 +0300
Subject: [PATCH 2/2] CLOUDINARY-213: Improved backward compatibility
 workarounds for M2.1 on ...Gallery\Content

---
 Block/Adminhtml/Product/Helper/Form/Gallery/Content.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index 61b083b..b4aee9d 100644
--- 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();