TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue for retrieving default view in defaultController

Browse Source
This commit is contained in:
Manuel Raynaud
2013-09-05 09:10:53 +02:00
parent c22761b60a
commit 86892f7af6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/Controller/Front/DefaultController.php
View File

@@ -49,7 +49,7 @@ class DefaultController extends BaseFrontController
if(ConfigQuery::isRewritingEnable()) { if(ConfigQuery::isRewritingEnable()) {
/* Does the query GET parameters match a rewritten URL ? */ /* Does the query GET parameters match a rewritten URL ? */
$rewrittenUrl = URL::getInstance()->retrieveCurrent(); $rewrittenUrl = URL::getInstance()->retrieveCurrent($request);
if($rewrittenUrl->rewrittenUrl !== null) { if($rewrittenUrl->rewrittenUrl !== null) {
/* 301 redirection to rewritten URL */ /* 301 redirection to rewritten URL */
$this->redirect($rewrittenUrl->rewrittenUrl, 301); $this->redirect($rewrittenUrl->rewrittenUrl, 301);
@@ -63,9 +63,13 @@ class DefaultController extends BaseFrontController
$view = $request->request->get('view'); $view = $request->request->get('view');
} }
} }
if(!is_null($view)) { if(null !== $view) {
$request->attributes->set('_view', $view); $request->attributes->set('_view', $view);
} }
if (null === $view && null === $request->attributes->get("_view")) {
$request->attributes->set("_view", "index");
}
} }
} }