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

[-] MO : #PSTEST-280 - Removed old-way method (deprecated) + fixed problem with cartRules

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12207 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-01-05 16:15:46 +00:00
parent 22d0737fd9
commit 0187d7b498
5 changed files with 205 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/FrontController.php
+5 -1
View File
@@ -53,6 +53,8 @@ class FrontControllerCore extends Controller
public $display_column_right = true;
public static $initialized = false;
protected $page_name = null;
protected static $currentCustomerGroups;
@@ -235,7 +237,9 @@ class FrontControllerCore extends Controller
// Are we in a payment module
$module_name = Tools::getValue('module');
if (Tools::getValue('controller') == 'module' && $module_name != '' && new $module_name() instanceof PaymentModule)
if (!is_null($this->page_name))
$page_name = $this->page_name;
else if (Tools::getValue('controller') == 'module' && $module_name != '' && new $module_name() instanceof PaymentModule)
$page_name = 'module-payment-submit';
// Are we in a module
else if (preg_match('#^'.preg_quote($this->context->shop->getPhysicalURI(), '#').'modules/([a-zA-Z0-9_-]+?)/(.*)$#', $_SERVER['REQUEST_URI'], $m))