// Fixed issue with configuration saving after a backup/update or anything linked to the usage of a mysql dump

This commit is contained in:
Damien Metzger
2013-06-24 14:41:58 +02:00
parent 41cc67961d
commit 24d5be445b
+2 -2
View File
@@ -505,9 +505,9 @@ class ConfigurationCore extends ObjectModel
if ($id_shop)
return ' AND id_shop = '.(int)$id_shop;
elseif ($id_shop_group)
return ' AND id_shop_group = '.(int)$id_shop_group.' AND id_shop IS NULL';
return ' AND id_shop_group = '.(int)$id_shop_group.' AND (id_shop IS NULL OR id_shop = 0)';
else
return ' AND id_shop_group IS NULL AND id_shop IS NULL';
return ' AND (id_shop_group IS NULL OR id_shop_group = 0) AND (id_shop IS NULL OR id_shop = 0)';
}
/**