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

rewriting router

Browse Source
This commit is contained in:
Etienne Roudeix
2013-09-06 08:59:06 +02:00
parent 41ed2dcebd
commit b95218295d
6 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/lib/Thelia/Core/Routing/RewritingRouter.php
View File

@@ -43,6 +43,7 @@ use Thelia\Tools\URL;
* Class RewritingRouter
* @package Thelia\Core\Routing
* @author Manuel Raynaud <mraynaud@openstudio.fr>
* @author Etienne Roudeix <eroudeix@openstudio.fr>
*/
class RewritingRouter implements RouterInterface, RequestMatcherInterface
{
@@ -170,7 +171,6 @@ class RewritingRouter implements RouterInterface, RequestMatcherInterface
if(ConfigQuery::isRewritingEnable()) {
try {
$rewrittenUrlData = URL::getInstance()->resolve($request->getPathInfo());
var_dump($rewrittenUrlData); exit;
} catch(UrlRewritingException $e) {
switch($e->getCode()) {
case UrlRewritingException::URL_NOT_FOUND :
@@ -205,13 +205,14 @@ class RewritingRouter implements RouterInterface, RequestMatcherInterface
return array (
'_controller' => 'Thelia\\Controller\\Front\\DefaultController::noAction',
'_route' => 'rewrite'
'_route' => 'rewrite',
'_rewritten' => true,
);
}
throw new ResourceNotFoundException();
}
protected function redirect($url, $code = 302)
protected function redirect($url, $status = 302)
{
Redirect::exec($url, $status);
}

2
core/lib/Thelia/Core/Template/Smarty/Plugins/UrlGenerator.php
View File

@@ -169,7 +169,7 @@ class UrlGenerator extends AbstractSmartyPlugin
protected function getCurrentUrl()
{
return URL::getInstance()->retrieveCurrent()->toString();
return URL::getInstance()->retrieveCurrent($this->request)->toString();
}
protected function getReturnToUrl()