[-] CORe : Fix #PSCFV-7314 unregisterHook and unregisterExceptions in module::uninstall

This commit is contained in:
gRoussac
2013-02-11 12:00:54 +01:00
parent c94bf2a823
commit 3bd56273ef
+3 -4
View File
@@ -502,9 +502,8 @@ abstract class ModuleCore
$result = Db::getInstance()->executeS($sql); $result = Db::getInstance()->executeS($sql);
foreach ($result as $row) foreach ($result as $row)
{ {
$sql = 'DELETE FROM `'._DB_PREFIX_.'hook_module` WHERE `id_module` = '.(int)$this->id.' AND `id_hook` = '.(int)$row['id_hook']; $this->unregisterHook((int)$row['id_hook']);
Db::getInstance()->execute($sql); $this->unregisterExceptions((int)$row['id_hook']);
$this->cleanPositions($row['id_hook']);
} }
// Disable the module for all shops // Disable the module for all shops
@@ -1999,7 +1998,7 @@ abstract class ModuleCore
if (!$override_class->hasProperty($property->getName())) if (!$override_class->hasProperty($property->getName()))
continue; continue;
// Remplacer la ligne de déclaration par "remove" // Remplacer la ligne de declaration par "remove"
foreach ($override_file as $line_number => &$line_content) foreach ($override_file as $line_number => &$line_content)
if (preg_match('/(public|private|protected)\s+(static\s+)?\$'.$property->getName().'/i', $line_content)) if (preg_match('/(public|private|protected)\s+(static\s+)?\$'.$property->getName().'/i', $line_content))
{ {