diff --git a/classes/FrontController.php b/classes/FrontController.php index c850e43e6..77f10bb7a 100755 --- a/classes/FrontController.php +++ b/classes/FrontController.php @@ -251,7 +251,9 @@ class FrontControllerCore extends Controller // Are we in a payment module $module_name = Tools::getValue('module'); - if (!empty($this->php_self)) + if (!empty($this->page_name)) + $page_name = $this->page_name; + else 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'; diff --git a/controllers/front/PageNotFoundController.php b/controllers/front/PageNotFoundController.php index 94ec80bf0..a44b5bdc5 100644 --- a/controllers/front/PageNotFoundController.php +++ b/controllers/front/PageNotFoundController.php @@ -28,6 +28,7 @@ class PageNotFoundControllerCore extends FrontController { public $php_self = '404'; + public $page_name = 'pagenotfound'; /** * Assign template vars related to page content diff --git a/modules/loyalty/loyaltyController.php b/modules/loyalty/loyaltyController.php index 4098c7373..b23fc53e7 100644 --- a/modules/loyalty/loyaltyController.php +++ b/modules/loyalty/loyaltyController.php @@ -34,7 +34,7 @@ include_once(dirname(__FILE__).'/LoyaltyStateModule.php'); class ModuleLoyaltyController extends ModuleController { - protected $php_self = 'module-loyalty-loyalty-program'; + protected $page_name = 'module-loyalty-loyalty-program'; /** * @see FrontController::postProcess() diff --git a/themes/default/header.tpl b/themes/default/header.tpl index 0ca244335..556f40fa7 100644 --- a/themes/default/header.tpl +++ b/themes/default/header.tpl @@ -60,7 +60,7 @@ {$HOOK_HEADER} - + {if !$content_only} {if isset($restricted_country_mode) && $restricted_country_mode}