From 24d5be445be6b2e4525eac01695b337373b4b510 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 24 Jun 2013 14:30:31 +0200 Subject: [PATCH] // Fixed issue with configuration saving after a backup/update or anything linked to the usage of a mysql dump --- classes/Configuration.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Configuration.php b/classes/Configuration.php index 65cc3d8b4..ee8871754 100644 --- a/classes/Configuration.php +++ b/classes/Configuration.php @@ -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)'; } /**