Skip to content

V2.9.2 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 19, 2018
Merged

V2.9.2 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b1c3168
Merge pull request #13 from GiritInteractive/v2.9.1
Dec 18, 2018
c17a9a3
CLOUDINARY-9: reset autoUpload state on save... + another fix for CLO…
Dec 19, 2018
e8dd7ae
Merge pull request #14 from GiritInteractive/CLOUDINARY-9
Dec 19, 2018
f3470eb
CLOUDINARY-9: reset autoUpload state on save... + another fix for CLO…
Dec 19, 2018
e92519b
Merge pull request #15 from GiritInteractive/CLOUDINARY-9
Dec 19, 2018
03275fd
v2.9.2: Changed module version to 2.9.2 (CLOUDINARY-7,CLOUDINARY-9,CL…
Dec 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/code/community/Cloudinary/Cloudinary/Model/Observer/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Cloudinary/Cloudinary/etc/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<config>
<modules>
<Cloudinary_Cloudinary>
<version>2.9.1</version>
<version>2.9.2</version>
</Cloudinary_Cloudinary>
</modules>
<global>
Expand Down
5 changes: 3 additions & 2 deletions lib/CloudinaryExtension/AutoUploadMapping/RequestProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
8 changes: 4 additions & 4 deletions lib/CloudinaryExtension/CloudinaryImageProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down