diff --git a/classes/controller/FrontController.php b/classes/controller/FrontController.php index 6d0c84725..6efd5bbb1 100755 --- a/classes/controller/FrontController.php +++ b/classes/controller/FrontController.php @@ -263,11 +263,12 @@ class FrontControllerCore extends Controller $module_name = ''; if (Validate::isModuleName(Tools::getValue('module'))) $module_name = Tools::getValue('module'); + if (!empty($this->page_name)) $page_name = $this->page_name; elseif (!empty($this->php_self)) $page_name = $this->php_self; - elseif (Tools::getValue('fc') == 'module' && $module_name != '' && new $module_name() instanceof PaymentModule) + elseif (Tools::getValue('fc') == 'module' && $module_name != '' && is_a($module_name, 'PaymentModule')) $page_name = 'module-payment-submit'; // @retrocompatibility Are we in a module ? elseif (preg_match('#^'.preg_quote($this->context->shop->physical_uri, '#').'modules/([a-zA-Z0-9_-]+?)/(.*)$#', $_SERVER['REQUEST_URI'], $m))