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

// Fix orders with friendly URL and dispatcher

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8157 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-23 08:54:14 +00:00
parent b2ff23ecac
commit 6d414e45c5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Dispatcher.php
+1
View File
@@ -413,6 +413,7 @@ class DispatcherCore
$this->controller = $controller; $this->controller = $controller;
$this->controller = str_replace('-', '', strtolower($this->controller)); $this->controller = str_replace('-', '', strtolower($this->controller));
$_GET['controller'] = $this->controller;
return $this->controller; return $this->controller;
} }
controllers/ParentOrderController.php
+2 -2
View File
@@ -56,9 +56,9 @@ class ParentOrderControllerCore extends FrontController
parent::preProcess(); parent::preProcess();
// Redirect to the good order process // Redirect to the good order process
if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 AND Tools::getValue('controller') != 'order') if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 AND Dispatcher::getInstance()->getController() != 'order')
Tools::redirect('index.php?controller=order'); Tools::redirect('index.php?controller=order');
if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 1 AND Tools::getValue('controller') != 'order-opc') if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 1 AND Dispatcher::getInstance()->getController() != 'order-opc')
{ {
if (isset($_GET['step']) AND $_GET['step'] == 3) if (isset($_GET['step']) AND $_GET['step'] == 3)
Tools::redirect('index.php?controller=order-opc&isPaymentStep=true'); Tools::redirect('index.php?controller=order-opc&isPaymentStep=true');