From dde916a786ea5c1b8b84d599fb2baa016e2f6d88 Mon Sep 17 00:00:00 2001 From: rMalie Date: Thu, 7 Jun 2012 12:03:54 +0000 Subject: [PATCH] // Fix useless instance of modules in FrontController git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15918 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/controller/FrontController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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))