aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-24 21:53:50 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-24 21:53:50 +0000
commitabeabb873bc12b7b24283143e55f35ad1159386b (patch)
treeafc12c09ecd4c53ec1ba57f43726e32c34e373f8
parent9c3f5a5883b2d6ba415e674d96d9c2e5a27d0999 (diff)
downloadelgg-abeabb873bc12b7b24283143e55f35ad1159386b.tar.gz
elgg-abeabb873bc12b7b24283143e55f35ad1159386b.tar.bz2
Removed the circular delete mechanism that was plaguing ElggFile
git-svn-id: https://code.elgg.org/elgg/trunk@1116 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/filestore.php11
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();
+ }
}
/**