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

core/lib/Thelia/Config/Resources/routing.xml

@@ -75,6 +75,10 @@
                 <argument key="debug">%kernel.debug%</argument>
             </argument>
             <argument type="service" id="request.context"/>
+            <tag name="router.register" priority="254"/>
+        </service>
+
+        <service id="router.rewrite" class="Thelia\Core\Routing\RewritingRouter">
             <tag name="router.register" priority="255"/>
         </service>
 

core/lib/Thelia/Config/Resources/routing/front.xml

@@ -60,13 +60,4 @@
         <default key="_view">cart</default>
     </route>
 
-
-<!-- Empêche l'accès àl'admin, genre: http://localhost/thelia2/index_dev.php/admin/login amène sur l'accueuil de la boutique
-
-    <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>