dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] MO : modules exceptions stability improved

Browse Source
This commit is contained in:
dMetzger
2011-05-02 12:36:27 +00:00
parent 5474660f47
commit 27cbda53ff
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Module.php
+4
View File
@@ -638,8 +638,12 @@ abstract class ModuleCore
$exceptions = $moduleInstance->getExceptions((int)$array['id_hook'], (int)$array['id_module']); $exceptions = $moduleInstance->getExceptions((int)$array['id_hook'], (int)$array['id_module']);
foreach ($exceptions AS $exception) foreach ($exceptions AS $exception)
{
if (empty($row['value']))
continue;
if (strstr(basename($_SERVER['PHP_SELF']).'?'.$_SERVER['QUERY_STRING'], $exception['file_name'])) if (strstr(basename($_SERVER['PHP_SELF']).'?'.$_SERVER['QUERY_STRING'], $exception['file_name']))
continue 2; continue 2;
}
if (is_callable(array($moduleInstance, 'hook'.$hook_name))) if (is_callable(array($moduleInstance, 'hook'.$hook_name)))
{ {
modules/themeinstallator/themeinstallator.php
+4 -3
View File
@@ -521,9 +521,10 @@ class ThemeInstallator extends Module
INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_hook`, `position`) INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_hook`, `position`)
VALUES ('.(int)$obj->id.', '.(int)Hook::get($hook[$count]).', '.(int)$position[$count].')'); VALUES ('.(int)$obj->id.', '.(int)Hook::get($hook[$count]).', '.(int)$position[$count].')');
foreach ($exceptions[$count] as $file_name) foreach ($exceptions[$count] as $file_name)
Db::getInstance()->Execute(' if (!empty($filename))
INSERT INTO `'._DB_PREFIX_.'hook_module_exceptions` (`id_module`, `id_hook`, `file_name`) Db::getInstance()->Execute('
VALUES ('.(int)$obj->id.', '.(int)Hook::get($hook[$count]).', "'.pSQL($file_name).'")'); INSERT INTO `'._DB_PREFIX_.'hook_module_exceptions` (`id_module`, `id_hook`, `file_name`)
VALUES ('.(int)$obj->id.', '.(int)Hook::get($hook[$count]).', "'.pSQL($file_name).'")');
} }
} }
} }