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

# By Etienne Roudeix # Via Etienne Roudeix * 'master' of https://github.com/thelia/thelia: fix URL::retrieve global outputs in loops
2013-09-04 15:45:19 +02:00
parent 62c1a59f68 b910b0af86
commit a461420c67
35 changed files with 203 additions and 118 deletions
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -52,5 +52,6 @@

    <route id="url-rewriting.check" path="/{rewritten_url}" methods="GET">
        <default key="_controller">Thelia\Controller\Front\UrlRewritingController::check</default>
+        <requirement key="rewritten_url">.*</requirement>
    </route>
 </routes>