Merge pull request #37 from cloudinary/v2.9.2

V2.9.2
cloudinary · Dec 19, 2018 · a8ed585 · a8ed585
2 parents 2ead0e2 + 03275fd
commit a8ed585
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/app/code/community/Cloudinary/Cloudinary/Model/Observer/Config.php b/app/code/community/Cloudinary/Cloudinary/Model/Observer/Config.php
@@ -3,6 +3,7 @@
 use CloudinaryExtension\CredentialValidator;
 use CloudinaryExtension\Security\CloudinaryEnvironmentVariable;
 use CloudinaryExtension\AutoUploadMapping\RequestProcessor;
+use CloudinaryExtension\AutoUploadMapping\Configuration;
 use CloudinaryExtension\AutoUploadMapping\ApiClient;
 
 class Cloudinary_Cloudinary_Model_Observer_Config extends Mage_Core_Model_Abstract
@@ -45,7 +46,7 @@ public function cloudinaryConfigChanged(Varien_Event_Observer $observer)
             return;
         }
 
-        if (!$this->autoUploadRequestProcessor()->handle('media', Mage::getBaseUrl('media'))) {
+        if (!$this->autoUploadRequestProcessor()->handle('media', Mage::getBaseUrl('media'), true)) {
             Mage::getSingleton('adminhtml/session')->addError(self::AUTO_UPLOAD_SETUP_FAIL_MESSAGE);
             Mage::getModel('cloudinary_cloudinary/logger')->error(self::AUTO_UPLOAD_SETUP_FAIL_MESSAGE);
         } else {

diff --git 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.1</version>
+            <version>2.9.2</version>
         </Cloudinary_Cloudinary>
     </modules>
     <global>

diff --git a/lib/CloudinaryExtension/AutoUploadMapping/RequestProcessor.php b/lib/CloudinaryExtension/AutoUploadMapping/RequestProcessor.php
@@ -31,11 +31,12 @@ public function __construct(
     /**
      * @param string $folder
      * @param string $url
+     * @param bool $force
      * @return bool
      */
-    public function handle($folder, $url)
+    public function handle($folder, $url, $force = false)
     {
-        if ($this->configuration->isActive() == $this->configuration->getRequestState()) {
+        if ($this->configuration->isActive() == $this->configuration->getRequestState() && !$force) {
             return true;
         }
 

diff --git a/lib/CloudinaryExtension/CloudinaryImageProvider.php b/lib/CloudinaryExtension/CloudinaryImageProvider.php
@@ -75,10 +75,10 @@ public function retrieveTransformed(Image $image, Transformation $transformation
         ]);
 
         if ($this->configuration->getUseRootPath()) {
-            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 (strpos($imagePath, "cloudinary.com/{$this->configuration->getCloud()}/image/upload/") !== false) {
+                $imagePath = str_replace("cloudinary.com/{$this->configuration->getCloud()}/image/upload/", "cloudinary.com/{$this->configuration->getCloud()}/", $imagePath);
+            } elseif (strpos($imagePath, "cloudinary.com/image/upload/") !== false) {
+                $imagePath = str_replace("cloudinary.com/image/upload/", "cloudinary.com/", $imagePath);
             }
         }
         if ($this->configuration->getRemoveVersionNumber()) {