From 8277d829145707dec0f00b7c5c08256d42f42677 Mon Sep 17 00:00:00 2001 From: Sacha Froment Date: Mon, 2 Mar 2015 11:12:24 +0100 Subject: [PATCH] [-] CORE : Fix #PSCSX-4794 correct abstrat class removeoverride --- classes/module/Module.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/module/Module.php b/classes/module/Module.php index aa02a0cc8087f..eabf1d3df5b7b 100644 --- a/classes/module/Module.php +++ b/classes/module/Module.php @@ -1064,7 +1064,7 @@ protected static function coreLoadModule($module_name) $time_start = microtime(true); $memory_start = memory_get_usage(true); } - + include_once(_PS_MODULE_DIR_.$module_name.'/'.$module_name.'.php'); $r = false; @@ -2750,7 +2750,7 @@ public function removeOverride($classname) $code .= $line; } - $to_delete = preg_match('/<\?(?:php)?\s+class\s+'.$classname.'\s+extends\s+'.$classname.'Core\s*?[{]\s*?[}]/ism', $code); + $to_delete = preg_match('/<\?(?:php)?\s+(?:abstract|interface)?\s*?class\s+'.$classname.'\s+extends\s+'.$classname.'Core\s*?[{]\s*?[}]/ism', $code); } if (!isset($to_delete) || $to_delete)