From 86892f7af6ef66efeb2363b5363da86165c86069 Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Thu, 5 Sep 2013 09:10:53 +0200 Subject: [PATCH] fix issue for retrieving default view in defaultController --- core/lib/Thelia/Controller/Front/DefaultController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/lib/Thelia/Controller/Front/DefaultController.php b/core/lib/Thelia/Controller/Front/DefaultController.php index a08451cc0..58501ebb0 100755 --- a/core/lib/Thelia/Controller/Front/DefaultController.php +++ b/core/lib/Thelia/Controller/Front/DefaultController.php @@ -49,7 +49,7 @@ class DefaultController extends BaseFrontController if(ConfigQuery::isRewritingEnable()) { /* Does the query GET parameters match a rewritten URL ? */ - $rewrittenUrl = URL::getInstance()->retrieveCurrent(); + $rewrittenUrl = URL::getInstance()->retrieveCurrent($request); if($rewrittenUrl->rewrittenUrl !== null) { /* 301 redirection to rewritten URL */ $this->redirect($rewrittenUrl->rewrittenUrl, 301); @@ -63,9 +63,13 @@ class DefaultController extends BaseFrontController $view = $request->request->get('view'); } } - if(!is_null($view)) { + if(null !== $view) { $request->attributes->set('_view', $view); } + if (null === $view && null === $request->attributes->get("_view")) { + $request->attributes->set("_view", "index"); + } + } }