diff --git a/README.md b/README.md index 5e2b014..fe4819b 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Magento 1 module for integration with Cloudinary. 3. Install the package... ## Install Manually -1. Download & copy/drag the directories `app`, `lib` & `skin` into your Magento 1 root dir. +1. Download & copy/drag the directories `app`, `js`, `lib` & `skin` into your Magento 1 root dir. 2. Clear cache from Magento admin panel or by running `rm -rf var/cache/* var/full_page_cache/*` under your Magento 1 root dir. ## Install Using Modman diff --git a/app/code/community/Cloudinary/Cloudinary/Helper/Autoloader.php b/app/code/community/Cloudinary/Cloudinary/Helper/Autoloader.php index 9485407..5255fa8 100644 --- a/app/code/community/Cloudinary/Cloudinary/Helper/Autoloader.php +++ b/app/code/community/Cloudinary/Cloudinary/Helper/Autoloader.php @@ -7,14 +7,19 @@ class Cloudinary_Cloudinary_Helper_Autoloader const CLOUDINARY_LIB_PATH = 'Cloudinary'; const CONVERT_CLASS_TO_PATH_REGEX = '#\\\|_(?!.*\\\)#'; + private $_registered; private $_originalAutoloaders; public function register() { - $this->_deregisterVarienAutoloaders(); - $this->_registerCloudinaryAutoloader(); - $this->_registerCloudinaryExtensionAutoloader(); - $this->_reregisterVarienAutoloaders(); + if(!$this->_registered){ + $this->_registered = true; + $this->_deregisterVarienAutoloaders(); + $this->_registerCloudinaryAutoloader(); + $this->_registerCloudinaryExtensionAutoloader(); + $this->_reregisterVarienAutoloaders(); + require_once(Mage::getBaseDir('lib') . DS . 'CloudinaryExtension' . DS . 'vendor' . DS. 'autoload.php'); + } } private function _registerCloudinaryExtensionAutoloader() @@ -67,4 +72,4 @@ private function _reregisterVarienAutoloaders() spl_autoload_register($autoloader); } } -} \ No newline at end of file +} diff --git a/app/code/community/Cloudinary/Cloudinary/etc/config.xml b/app/code/community/Cloudinary/Cloudinary/etc/config.xml index 97f999a..610a385 100644 --- a/app/code/community/Cloudinary/Cloudinary/etc/config.xml +++ b/app/code/community/Cloudinary/Cloudinary/etc/config.xml @@ -2,7 +2,7 @@ - 3.1.0 + 3.1.2 @@ -92,15 +92,6 @@ - - - - singleton - cloudinary_cloudinary/observer_autoload - autoloadRegister - - - @@ -128,6 +119,15 @@ + + + + singleton + cloudinary_cloudinary/observer_system + loadCustomAutoloaders + + + diff --git a/var/connect/Cloudinary_Cloudinary-3.1.1.tgz b/var/connect/Cloudinary_Cloudinary-3.1.1.tgz deleted file mode 100644 index 88beb6f..0000000 Binary files a/var/connect/Cloudinary_Cloudinary-3.1.1.tgz and /dev/null differ diff --git a/var/connect/Cloudinary_Cloudinary-3.1.2.tgz b/var/connect/Cloudinary_Cloudinary-3.1.2.tgz new file mode 100644 index 0000000..2d90e97 Binary files /dev/null and b/var/connect/Cloudinary_Cloudinary-3.1.2.tgz differ diff --git a/var/connect/Cloudinary_Cloudinary.xml b/var/connect/Cloudinary_Cloudinary.xml index 1a2ee0a..d9b6696 100644 --- a/var/connect/Cloudinary_Cloudinary.xml +++ b/var/connect/Cloudinary_Cloudinary.xml @@ -1,5 +1,5 @@ <_> - UQi1chJu9f8zOXQ6 + UPQSe5plXZBPcC8A Cloudinary_Cloudinary community @@ -9,7 +9,7 @@ Cloudinary supercharges your images! Upload images to the cloud, deliver optimized via a fast CDN, perform smart resizing and apply effects. MIT License (MITL) - 3.1.1 + 3.1.2 stable - Match MEQP1 coding standards @@ -41,7 +41,7 @@ - + diff --git a/var/connect/package.xml b/var/connect/package.xml index a269938..8aebc0f 100644 --- a/var/connect/package.xml +++ b/var/connect/package.xml @@ -1,7 +1,7 @@ Cloudinary_Cloudinary - 3.1.1 + 3.1.2 stable MIT License (MITL) community @@ -11,9 +11,9 @@ - Match MEQP1 coding standards Cloudinarycloudinaryaccounts+magento@cloudinary.com - 2020-03-19 - - + 2020-09-27 + + 5.4.07.2.2