Removed the circular delete mechanism that was plaguing ElggFile

git-svn-id: https://code.elgg.org/elgg/trunk@1116 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 4 insertions, 7 deletions

diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
index 25befa449..1fd292b83 100644
--- a/engine/lib/filestore.php
+++ b/engine/lib/filestore.php
@@ -192,11 +192,7 @@
 		
 		public function delete(ElggFile $file)
 		{
-			$unlink = unlink($this->getFilenameOnFilestore($file));
-			if ($unlink)
-				return $file->delete();
-	
-			return false;
+			return unlink($this->getFilenameOnFilestore($file));
 		}
 		
 		public function seek($f, $position)
@@ -446,8 +442,9 @@
 		public function delete()
 		{
 			$fs = $this->getFilestore();
-			
-			return $fs->delete($this);
+			if ($fs->delete($this)) {

+				return parent::delete();

+			}
 		}
 		
 		/**