MDL-16231 fixed regression - completed delete file refactoring

diff --git a/lib/file/file_storage.php b/lib/file/file_storage.php
index 7166b5f7a4436d4a9fa67fb8867abb36fa1465e6..ecd68693328c0bfee6fea593ce417eef7092e0cc 100644 (file)
--- 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);