From d90ddd2f9be750d3bf827679f49943166b486ad4 Mon Sep 17 00:00:00 2001 From: Jerome Bakker Date: Thu, 30 May 2013 16:48:33 +0200 Subject: ElggFile->delete() will return a correct state even for non saved entities --- engine/classes/ElggFile.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/engine/classes/ElggFile.php b/engine/classes/ElggFile.php index 3e9c24c17..23080834b 100644 --- a/engine/classes/ElggFile.php +++ b/engine/classes/ElggFile.php @@ -275,9 +275,14 @@ class ElggFile extends ElggObject { */ public function delete() { $fs = $this->getFilestore(); - if ($fs->delete($this)) { - return parent::delete(); + + $result = $fs->delete($this); + + if ($this->getGUID() && $result) { + $result = parent::delete(); } + + return $result; } /** -- cgit v1.2.3