dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix on discounts with multishop + index?controller=index fixed to be only index.php

Browse Source
This commit is contained in:
rMalie
2011-08-08 08:29:32 +00:00
parent 826d258e70
commit 2b71b8be68
3 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Dispatcher.php
+4 -2
View File
@@ -190,6 +190,8 @@ class DispatcherCore
// Get and instantiate controller
$this->getController();
$controllers = Dispatcher::getControllers();
if (!$this->controller)
$this->controller = 'index';
if (!isset($controllers[$this->controller]))
$this->controller = 'pagenotfound';
ControllerFactory::getController($controllers[$this->controller])->run();
@@ -323,7 +325,7 @@ class DispatcherCore
if (!isset($this->routes[$routeID]))
{
$query = http_build_query($params);
return 'index.php?controller='.$routeID.(($query) ? '&'.$query : '');
return ($routeID == 'index') ? 'index.php'.(($query) ? '?'.$query : '') : 'index.php?controller='.$routeID.(($query) ? '&'.$query : '');
}
$route = $this->routes[$routeID];
@@ -408,7 +410,7 @@ class DispatcherCore
}
// Default mode, take controller from url
else
$this->controller = (!empty($controller)) ? $controller : 'index';
$this->controller = $controller;
$this->controller = str_replace('-', '', strtolower($this->controller));
return $this->controller;