// MERGE product_multistore branch : product fields are now editable per shop

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 13:32:12 +00:00
parent d4d1c35cb9
commit 0c2dd0cd2f
134 changed files with 3185 additions and 1789 deletions
@@ -128,9 +128,10 @@ class ProductDownloadCore extends ObjectModel

 	public function delete($delete = false)
 	{
-		if ($delete)
+		$result = parent::delete();
+		if ($result && $delete)
 			return $this->deleteFile();
-		return true;
+		return $result;
 	}

 	/**