Merge remote-tracking branch 'origin/development' into development

2013-11-07 16:39:26 +01:00
parent b9c4b5d2a7 fbd28f3e49
commit fa7d44d67f
1 changed files with 1 additions and 1 deletions
@@ -326,7 +326,7 @@ class HookCore extends ObjectModel
 			if ($frontend)
 			{
 				$sql->leftJoin('module_group', 'mg', 'mg.`id_module` = m.`id_module`');
-				$sql->where('mg.`id_group` IN ('.implode(', ', $groups).')');
+				$sql->where('mg.id_shop = '.((int)$context->shop->id).' AND  mg.`id_group` IN ('.implode(', ', $groups).')');
 				$sql->groupBy('hm.id_hook, hm.id_module');
 			}