diff --git a/app/code/community/Cloudinary/Cloudinary/Model/Observer/Config.php b/app/code/community/Cloudinary/Cloudinary/Model/Observer/Config.php index b507b76..378d64b 100644 --- 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 index 8c5bcb4..6134791 100644 --- a/app/code/community/Cloudinary/Cloudinary/etc/config.xml +++ b/app/code/community/Cloudinary/Cloudinary/etc/config.xml @@ -2,7 +2,7 @@ - 2.9.1 + 2.9.2 diff --git a/lib/CloudinaryExtension/AutoUploadMapping/RequestProcessor.php b/lib/CloudinaryExtension/AutoUploadMapping/RequestProcessor.php index b837d7f..c58a581 100644 --- 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 index b4dcff3..a9372dd 100644 --- 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()) {