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); } /** 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 @@ - 2.9.0 + 2.9.1 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(), '/'), '/') . '$/';