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

Conflicts: core/lib/Thelia/Config/Resources/routing/front.xml
2013-09-04 17:57:41 +02:00
parent ceb02841e1 866036a0bf
commit 3f405d1ce9
162 changed files with 10966 additions and 10282 deletions
--- a/core/lib/Thelia/Form/BaseForm.php
+++ b/core/lib/Thelia/Form/BaseForm.php
@@ -135,7 +135,7 @@ abstract class BaseForm
            $successUrl = $default;
        }

-        return URL::absoluteUrl($successUrl);
+        return URL::getInstance()->absoluteUrl($successUrl);
    }

    public function createView()