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

[-] CORE : fixed bug #PSCFV-5536 - Layout for index controller is broken

Browse Source
This commit is contained in:
vAugagneur
2012-11-23 19:01:26 +01:00
parent 8a3e8d1d73
commit 6f4de596c6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Dispatcher.php
+5 -3
View File
@@ -243,7 +243,6 @@ class DispatcherCore
$this->getController(); $this->getController();
if (!$this->controller) if (!$this->controller)
$this->controller = $this->default_controller; $this->controller = $this->default_controller;
// Dispatch with right front controller // Dispatch with right front controller
switch ($this->front_controller) switch ($this->front_controller)
{ {
@@ -642,10 +641,13 @@ class DispatcherCore
* @return string * @return string
*/ */
public function getController() public function getController()
{ {
if ($this->controller) if ($this->controller)
{
$_GET['controller'] = $this->controller;
return $this->controller; return $this->controller;
}
$controller = Tools::getValue('controller'); $controller = Tools::getValue('controller');
if (isset($controller) && is_string($controller) && preg_match('/^([0-9a-z_-]+)\?(.*)=(.*)$/Ui', $controller, $m)) if (isset($controller) && is_string($controller) && preg_match('/^([0-9a-z_-]+)\?(.*)=(.*)$/Ui', $controller, $m))