Merge branch 'master' of github.com:thelia/thelia

core/lib/Thelia/Model/Customer.php

@@ -79,6 +79,7 @@ class Customer extends BaseCustomer implements UserInterface
                 $address = new Address();
 
                 $address
+                    ->setLabel("default")
                     ->setCompany($company)
                     ->setTitleId($titleId)
                     ->setFirstname($firstname)

core/lib/Thelia/Model/Module.php

@@ -2,8 +2,13 @@
 
 namespace Thelia\Model;
 
+use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Model\Base\Module as BaseModule;
 
 class Module extends BaseModule {
 
+    public function postSave(ConnectionInterface $con = null)
+    {
+        ModuleQuery::resetActivated();
+    }
 }

core/lib/Thelia/Model/ModuleQuery.php

@@ -16,13 +16,26 @@ use Thelia\Model\Base\ModuleQuery as BaseModuleQuery;
  *
  */
 class ModuleQuery extends BaseModuleQuery {
+
+    protected static $activated = null;
     /**
      * @return array|mixed|\PropelObjectCollection
      */
     public static function getActivated()
     {
-        return self::create()
-            ->filterByActivate(1)
-            ->find();
+        if(null === self::$activated) {
+            self::$activated = self::create()
+                ->filterByActivate(1)
+                ->find();
+        }
+
+        return self::$activated;
     }
+
+    public static function resetActivated()
+    {
+        self::$activated = null;
+    }
+
+
 } // ModuleQuery