[-] CORE : Fix #PSCSX-4794 correct abstrat class removeoverride

PrestaShop · Mar 2, 2015 · 8277d82 · 8277d82
1 parent d7a8fe0
commit 8277d82
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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)