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

// small fix

Browse Source
This commit is contained in:
Rémi Gaillard
2013-11-04 17:23:04 +01:00
parent ddd722dc14
commit 2c3a5c553d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Hook.php
+6 -2
View File
@@ -390,6 +390,10 @@ class HookCore extends ObjectModel
*/
public static function exec($hook_name, $hook_args = array(), $id_module = null, $array_return = false, $check_exceptions = true, $use_push = false)
{
static $disable_non_native_modules = null;
if ($disable_non_native_modules === null)
$disable_non_native_modules = (bool)Configuration::get('PS_DISABLE_NON_NATIVE_MODULE');
// Check arguments validity
if (($id_module && !is_numeric($id_module)) || !Validate::isHookName($hook_name))
throw new PrestaShopException('Invalid id_module or hook_name');
@@ -419,7 +423,7 @@ class HookCore extends ObjectModel
$altern = 0;
$output = '';
if (!isset(Hook::$native_module))
if ($disable_non_native_modules && !isset(Hook::$native_module))
Hook::$native_module = Module::getNativeModuleList();
foreach ($module_list as $array)
@@ -428,7 +432,7 @@ class HookCore extends ObjectModel
if ($id_module && $id_module != $array['id_module'])
continue;
if ((bool)Configuration::get('PS_DISABLE_NON_NATIVE_MODULE') && !in_array($array['module'], self::$native_module))
if ((bool)$disable_non_native_modules && Hook::$native_module && count(Hook::$native_module) && !in_array($array['module'], self::$native_module))
continue;
if (!($moduleInstance = Module::getInstanceByName($array['module'])))