v3.1.2

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

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);
         }
     }
-} 
+}

app/code/community/Cloudinary/Cloudinary/etc/config.xml

@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Cloudinary_Cloudinary>
-            <version>3.1.0</version>
+            <version>3.1.2</version>
         </Cloudinary_Cloudinary>
     </modules>
 
@@ -92,15 +92,6 @@
             </cloudinary_cloudinary>
         </helpers>
         <events>
-            <controller_front_init_before>
-                <observers>
-                    <cloudinary_autoloader>
-                        <type>singleton</type>
-                        <class>cloudinary_cloudinary/observer_autoload</class>
-                        <method>autoloadRegister</method>
-                    </cloudinary_autoloader>
-                </observers>
-            </controller_front_init_before>
             <catalog_product_save_after>
                 <observers>
                     <upload_images_to_cloudinary>
@@ -128,6 +119,15 @@
                     </load_custom_autoloaders>
                 </observers>
             </controller_front_init_before>
+            <core_collection_abstract_load_before>
+                <observers>
+                    <load_custom_autoloaders2>
+                        <type>singleton</type>
+                        <class>cloudinary_cloudinary/observer_system</class>
+                        <method>loadCustomAutoloaders</method>
+                    </load_custom_autoloaders2>
+                </observers>
+            </core_collection_abstract_load_before>
         </events>
         <resources>
             <cloudinary_setup>

var/connect/Cloudinary_Cloudinary.xml

@@ -1,5 +1,5 @@
 <_>
-   <form_key>UQi1chJu9f8zOXQ6</form_key>
+   <form_key>UPQSe5plXZBPcC8A</form_key>
    <name>Cloudinary_Cloudinary</name>
    <channel>community</channel>
    <version_ids>
@@ -9,7 +9,7 @@
    <description>Cloudinary supercharges your images! Upload images to the cloud, deliver optimized via a fast CDN, perform smart resizing and apply effects.</description>
    <license>MIT License (MITL)</license>
    <license_uri/>
-   <version>3.1.1</version>
+   <version>3.1.2</version>
    <stability>stable</stability>
    <notes>      - Match MEQP1 coding standards
    </notes>
@@ -41,7 +41,7 @@
             <max/>
          </max>
          <files>
-            <files>                                      </files>
+            <files>                                        </files>
          </files>
       </package>
       <extension>