From b8fa4db829467be07863a6d8fba070aa91671e67 Mon Sep 17 00:00:00 2001
From: pini-girit <pini@girit.biz>
Date: Tue, 18 Dec 2018 14:09:56 +0200
Subject: [PATCH 1/3] CLOUDINARY-40: Added support for cloudless URLs on 'Use
 Root Path'

---
 lib/CloudinaryExtension/CloudinaryImageProvider.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/CloudinaryExtension/CloudinaryImageProvider.php b/lib/CloudinaryExtension/CloudinaryImageProvider.php
index 96f0b29..b4dcff3 100644
--- a/lib/CloudinaryExtension/CloudinaryImageProvider.php
+++ b/lib/CloudinaryExtension/CloudinaryImageProvider.php
@@ -75,7 +75,11 @@ public function retrieveTransformed(Image $image, Transformation $transformation
         ]);
 
         if ($this->configuration->getUseRootPath()) {
-            $imagePath = str_replace(".com/{$this->configuration->getCloud()}/image/upload/", ".com/{$this->configuration->getCloud()}/", $imagePath);
+            if (strpos($imagePath, ".com/{$this->configuration->getCloud()}/image/upload/") !== false) {
+                $imagePath = str_replace(".com/{$this->configuration->getCloud()}/image/upload/", ".com/{$this->configuration->getCloud()}/", $imagePath);
+            } elseif (strpos($imagePath, ".com/image/upload/") !== false) {
+                $imagePath = str_replace(".com/image/upload/", ".com/", $imagePath);
+            }
         }
         if ($this->configuration->getRemoveVersionNumber()) {
             $regex = '/\/v[0-9]+\/' . preg_quote(ltrim($image->getId(), '/'), '/') . '$/';

From 15f28267d9eab7c155d3193b6667aff0f015d95f Mon Sep 17 00:00:00 2001
From: pini-girit <pini@girit.biz>
Date: Tue, 18 Dec 2018 14:11:02 +0200
Subject: [PATCH 2/3] CLOUDINARY-39: Fixed getUseRootPath() on Config model

---
 .../community/Cloudinary/Cloudinary/Model/Configuration.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Cloudinary/Cloudinary/Model/Configuration.php b/app/code/community/Cloudinary/Cloudinary/Model/Configuration.php
index 6ad291c..b1537a7 100644
--- a/app/code/community/Cloudinary/Cloudinary/Model/Configuration.php
+++ b/app/code/community/Cloudinary/Cloudinary/Model/Configuration.php
@@ -262,7 +262,7 @@ public function getRemoveVersionNumber()
      */
     public function getUseRootPath()
     {
-        return (bool) Mage::getStoreConfig(self::CONFIG_PATH_REMOVE_VERSION_NUMBER);
+        return (bool) Mage::getStoreConfig(self::CONFIG_PATH_USE_ROOT_PATH);
     }
 
     /**

From 10126eba99313c42474656d77fbdf57c5a099fe5 Mon Sep 17 00:00:00 2001
From: pini-girit <pini@girit.biz>
Date: Tue, 18 Dec 2018 14:19:03 +0200
Subject: [PATCH 3/3] Changed module version to v2.9.1

---
 app/code/community/Cloudinary/Cloudinary/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Cloudinary/Cloudinary/etc/config.xml b/app/code/community/Cloudinary/Cloudinary/etc/config.xml
index 616c174..8c5bcb4 100644
--- a/app/code/community/Cloudinary/Cloudinary/etc/config.xml
+++ b/app/code/community/Cloudinary/Cloudinary/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Cloudinary_Cloudinary>
-            <version>2.9.0</version>
+            <version>2.9.1</version>
         </Cloudinary_Cloudinary>
     </modules>
     <global>