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

Conflicts: core/lib/Thelia/Core/Template/Element/BaseLoop.php
2013-07-09 11:45:01 +02:00
parent dd05888450 89a8ef80fe
commit aa6fe04eec
32 changed files with 2069 additions and 98 deletions
--- a/core/lib/Thelia/Model/Customer.php
+++ b/core/lib/Thelia/Model/Customer.php
@@ -105,7 +105,7 @@ class Customer extends BaseCustomer implements UserInterface
            $this->setAlgo("PASSWORD_BCRYPT");
            return parent::setPassword(password_hash($password, PASSWORD_BCRYPT));
        }
-
+        return $this;
    }

    public function setDispatcher(EventDispatcherInterface $dispatcher)