// Fix #PSCFV-4628

2012-10-02 18:57:39 +00:00
parent 8fa71daa6a
commit 7ee95c63f6
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