Merge conflict

2013-10-14 12:53:01 +02:00
parent 4441fc8190 b5f57a4819
commit 94bcf9a191
5 changed files with 78 additions and 12 deletions
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -9,6 +9,13 @@
        <default key="_view">index</default>
    </route>

+
+    <!-- Search routes -->
+    <route id="search" path="/search">
+        <default key="_controller">Thelia\Controller\Front\DefaultController::noAction</default>
+        <default key="_view">search</default>
+    </route>
+
    <!-- Customer routes : Register -->
    <route id="customer.create.process" path="/register" methods="post">
        <default key="_controller">Thelia\Controller\Front\CustomerController::createAction</default>