Merge branch 'master' into brands

Conflicts: core/lib/Thelia/Tools/FileManager.php setup/update/2.0.3.sql
2014-06-26 16:35:08 +02:00
parent 65dd2fb129 ec6c39096f
commit ca862b07e4
26 changed files with 535 additions and 144 deletions
--- a/core/lib/Thelia/Action/Address.php
+++ b/core/lib/Thelia/Action/Address.php
@@ -79,7 +79,7 @@ class Address extends BaseAction implements EventSubscriberInterface
                ->save()
            ;

-            if ($event->getIsDefault()) {
+            if ($event->getIsDefault() && !$addressModel->getIsDefault()) {
                $addressModel->makeItDefault();
            }