From abeabb873bc12b7b24283143e55f35ad1159386b Mon Sep 17 00:00:00 2001
From: ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 24 Jun 2008 21:53:50 +0000
Subject: Removed the circular delete mechanism that was plaguing ElggFile

git-svn-id: https://code.elgg.org/elgg/trunk@1116 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/filestore.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'engine/lib/filestore.php')

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();
+			}
 		}
 		
 		/**
-- 
cgit v1.2.3