Merge branch 'm34_MDL-60318_Undefined_method_file_storage-move_to_tra…

…sh' of https://github.com/scara/moodle
moodle · Oct 9, 2017 · 4c54ac2 · 4c54ac2
2 parents eda8027 + 5ca85a1
commit 4c54ac2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/filestorage/file_storage.php b/lib/filestorage/file_storage.php
@@ -1326,7 +1326,7 @@ public function create_file_from_pathname($filerecord, $pathname) {
             $this->create_file($newrecord);
         } catch (dml_exception $e) {
             if ($newfile) {
-                $this->move_to_trash($newrecord->contenthash);
+                $this->filesystem->remove_file($newrecord->contenthash);
             }
             throw new stored_file_creation_exception($newrecord->contextid, $newrecord->component, $newrecord->filearea, $newrecord->itemid,
                                                     $newrecord->filepath, $newrecord->filename, $e->debuginfo);
@@ -1445,7 +1445,7 @@ public function create_file_from_string($filerecord, $content) {
             $this->create_file($newrecord);
         } catch (dml_exception $e) {
             if ($newfile) {
-                $this->move_to_trash($newrecord->contenthash);
+                $this->filesystem->remove_file($newrecord->contenthash);
             }
             throw new stored_file_creation_exception($newrecord->contextid, $newrecord->component, $newrecord->filearea, $newrecord->itemid,
                                                     $newrecord->filepath, $newrecord->filename, $e->debuginfo);
@@ -1604,7 +1604,7 @@ public function create_file_from_reference($filerecord, $repositoryid, $referenc
             $filerecord->id = $DB->insert_record('files', $filerecord);
         } catch (dml_exception $e) {
             if (!empty($newfile)) {
-                $this->move_to_trash($filerecord->contenthash);
+                $this->filesystem->remove_file($filerecord->contenthash);
             }
             throw new stored_file_creation_exception($filerecord->contextid, $filerecord->component, $filerecord->filearea, $filerecord->itemid,
                                                     $filerecord->filepath, $filerecord->filename, $e->debuginfo);