//small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16719 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
+1
-1
@@ -385,7 +385,7 @@ class ImageCore extends ObjectModel
|
|||||||
* Delete the product image from disk and remove the containing folder if empty
|
* Delete the product image from disk and remove the containing folder if empty
|
||||||
* Handles both legacy and new image filesystems
|
* Handles both legacy and new image filesystems
|
||||||
*/
|
*/
|
||||||
public function deleteImage()
|
public function deleteImage($force_delete = false)
|
||||||
{
|
{
|
||||||
if (!$this->id)
|
if (!$this->id)
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
+1
-1
@@ -116,7 +116,7 @@ class SceneCore extends ObjectModel
|
|||||||
return false;
|
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
|
// 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'])))
|
if (isset($_FILES['thumb']) && (!isset($_FILES['image']) || empty($_FILES['image']['name'])))
|
||||||
|
|||||||
Reference in New Issue
Block a user