From: skodak <skodak>
Date: Mon, 27 Jul 2009 12:39:13 +0000 (+0000)
Subject: MDL-16231 fixed regression - completed delete file refactoring
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ead1429070ccbea0b796335913db19c548054d15;p=moodle.git

MDL-16231 fixed regression - completed delete file refactoring
---

diff --git a/lib/file/file_storage.php b/lib/file/file_storage.php
index 7166b5f7a4..ecd6869332 100644
--- a/lib/file/file_storage.php
+++ b/lib/file/file_storage.php
@@ -640,7 +640,7 @@ class file_storage {
 
         if (!$newrecord->id) {
             if ($newfile) {
-                $this->mark_delete_candidate($newrecord->contenthash);
+                $this->deleted_file_cleanup($newrecord->contenthash);
             }
             throw new stored_file_creation_exception($newrecord->contextid, $newrecord->filearea, $newrecord->itemid,
                                                     $newrecord->filepath, $newrecord->filename);
@@ -716,7 +716,7 @@ class file_storage {
 
         if (!$newrecord->id) {
             if ($newfile) {
-                $this->mark_delete_candidate($newrecord->contenthash);
+                $this->deleted_file_cleanup($newrecord->contenthash);
             }
             throw new stored_file_creation_exception($newrecord->contextid, $newrecord->filearea, $newrecord->itemid,
                                                     $newrecord->filepath, $newrecord->filename);