From e602884ce019167781416423aba85438af3f57f0 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 18 Oct 2013 10:06:42 +0200
Subject: [PATCH] end module activation

---
 core/lib/Thelia/Action/Module.php     |  4 +---
 core/lib/Thelia/Module/BaseModule.php | 10 ++++++----
 local/modules/Cheque/Cheque.php       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/lib/Thelia/Action/Module.php b/core/lib/Thelia/Action/Module.php
index 213024e16..040c9f7b4 100644
--- a/core/lib/Thelia/Action/Module.php
+++ b/core/lib/Thelia/Action/Module.php
@@ -53,9 +53,7 @@ class Module extends BaseAction implements EventSubscriberInterface
                 }
             }
 
-            if ($module->isModified()) {
-                $event->setModule($module);
-            }
+            $event->setModule($module);
 
             $this->cacheClear();
         }
diff --git a/core/lib/Thelia/Module/BaseModule.php b/core/lib/Thelia/Module/BaseModule.php
index 83636b921..598e25baa 100755
--- a/core/lib/Thelia/Module/BaseModule.php
+++ b/core/lib/Thelia/Module/BaseModule.php
@@ -135,17 +135,19 @@ abstract class BaseModule extends ContainerAware
         }
     }
 
-    public function deployImageFolder(Module $module, $folderPath)
+    public function deployImageFolder(Module $module, $folderPath, ConnectionInterface $con = null)
     {
         try {
             $directoryBrowser = new \DirectoryIterator($folderPath);
         } catch (\UnexpectedValueException $e) {
             throw $e;
         }
+        if(null === $con) {
+            $con = \Propel\Runtime\Propel::getConnection(
+                ModuleImageTableMap::DATABASE_NAME
+            );
+        }
 
-        $con = \Propel\Runtime\Propel::getConnection(
-            ModuleImageTableMap::DATABASE_NAME
-        );
 
         /* browse the directory */
         $imagePosition = 1;
diff --git a/local/modules/Cheque/Cheque.php b/local/modules/Cheque/Cheque.php
index 324728990..cebaff146 100755
--- a/local/modules/Cheque/Cheque.php
+++ b/local/modules/Cheque/Cheque.php
@@ -66,7 +66,7 @@ class Cheque extends BaseModule implements PaymentModuleInterface
         /* insert the images from image folder if first module activation */
         $module = $this->getModuleModel();
         if(ModuleImageQuery::create()->filterByModule($module)->count() == 0) {
-            $this->deployImageFolder($module, sprintf('%s/images', __DIR__));
+            $this->deployImageFolder($module, sprintf('%s/images', __DIR__), $con);
         }
 
         /* set module title */