// REVERT MERGE

classes/Manufacturer.php

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