From 4815e5d2f54bcf5e65a7276607222116b9a9abf3 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Mon, 6 Aug 2012 12:40:55 +0000 Subject: [PATCH] //small fix git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16719 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Image.php | 2 +- classes/Scene.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Image.php b/classes/Image.php index cc9187db8..6a2b2a95f 100644 --- a/classes/Image.php +++ b/classes/Image.php @@ -385,7 +385,7 @@ class ImageCore extends ObjectModel * Delete the product image from disk and remove the containing folder if empty * Handles both legacy and new image filesystems */ - public function deleteImage() + public function deleteImage($force_delete = false) { if (!$this->id) return false; diff --git a/classes/Scene.php b/classes/Scene.php index 4b95cc77e..f44ccd2e4 100644 --- a/classes/Scene.php +++ b/classes/Scene.php @@ -116,7 +116,7 @@ class SceneCore extends ObjectModel return false; } - public function deleteImage() + public function deleteImage($force_delete = false) { // Hack to prevent the main scene image from being deleted in AdminController::uploadImage() when a thumb image is uploaded if (isset($_FILES['thumb']) && (!isset($_FILES['image']) || empty($_FILES['image']['name'])))