// Fix #PSCFV-4628

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17695 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-02 18:57:39 +00:00
parent 71eda6c6f3
commit 5b554435cf
5 changed files with 40 additions and 9 deletions
@@ -89,9 +89,13 @@ class ImageCore extends ObjectModel

 	public function delete()
 	{
-		if (!parent::delete() ||
-			!$this->deleteProductAttributeImage() ||
-			!$this->deleteImage())
+		if (!parent::delete())
+			return false;
+
+		if ($this->hasMultishopEntries())
+			return true;
+
+		if (!$this->deleteProductAttributeImage() || !$this->deleteImage())
 			return false;

 		// update positions