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

// Restore good page_name for controllers with - in name

Browse Source
This commit is contained in:
rMalie
2012-01-20 09:05:31 +00:00
parent bf35baa405
commit 73a1cfdbeb
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/FrontController.php
+3 -5
View File
@@ -53,8 +53,6 @@ class FrontControllerCore extends Controller
public $display_column_right = true;
public static $initialized = false;
protected $page_name = null;
protected static $currentCustomerGroups;
@@ -253,8 +251,8 @@ class FrontControllerCore extends Controller
// Are we in a payment module
$module_name = Tools::getValue('module');
if (!is_null($this->page_name))
$page_name = $this->page_name;
if (!empty($this->php_self))
$page_name = $this->php_self;
else if (Tools::getValue('controller') == 'module' && $module_name != '' && new $module_name() instanceof PaymentModule)
$page_name = 'module-payment-submit';
// Are we in a module
@@ -274,7 +272,7 @@ class FrontControllerCore extends Controller
$this->context->smarty->assign('navigationPipe', $navigationPipe);
// Automatically redirect to the canonical URL if needed
if (isset($this->php_self) && !empty($this->php_self) && !Tools::getValue('ajax'))
if (!empty($this->php_self) && !Tools::getValue('ajax'))
$this->canonicalRedirection($this->context->link->getPageLink($this->php_self, $this->ssl, $this->context->language->id));
Product::initPricesComputation();