ElggFile->delete() will return a correct state even for non saved

entities

diff --git a/engine/classes/ElggFile.php b/engine/classes/ElggFile.php
index 3e9c24c1767a08fee75fa3af68e910d9d6093c89..23080834bd4a3b34e0a8acb4121d7da2efa01bd1 100644 (file)
--- 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;
        }
 
        /**