// MERGE with trunk revision 7754

2011-07-27 12:48:42 +00:00
parent 21017fb5d8
commit 233c0076b7
182 changed files with 6179 additions and 1333 deletions
@@ -77,6 +77,7 @@ class ManufacturerCore extends ObjectModel

 	protected	$webserviceParameters = array(
 		'fields' => array(
+			'active' => array(),
 			'link_rewrite' => array('getter' => 'getLink', 'setter' => false),
 		),
 		'associations' => array(
@@ -374,16 +375,19 @@ class ManufacturerCore extends ObjectModel
 		$ids = array();
 		foreach ($id_addresses as $id)
 			$ids[] = (int)$id['id'];
-		Db::getInstance()->ExecuteS('
+		$result1 = (Db::getInstance()->ExecuteS('
 			UPDATE `'._DB_PREFIX_.'address` 
 			SET id_manufacturer = 0 
 			WHERE id_manufacturer = '.(int)$this->id.' 
-			AND deleted = 0');
-		return (Db::getInstance()->ExecuteS('
+			AND deleted = 0') !== false);
+		$result2 = true;
+		if (count($ids))
+			$result2 = (Db::getInstance()->ExecuteS('
 			UPDATE `'._DB_PREFIX_.'address` 
 			SET id_customer = 0, id_supplier = 0, id_manufacturer = '.(int)$this->id.' 
 			WHERE id_address IN('.implode(',', $ids).') 
 			AND deleted = 0') !== false);
+		return ($result1 && $result2);
 	}
 }