MDL-60318 filestorage: Fixed undefined method move_to_trash()
authorMatteo Scaramuccia <moodle@matteoscaramuccia.com>
Mon, 2 Oct 2017 20:49:42 +0000 (22:49 +0200)
committerMatteo Scaramuccia <moodle@matteoscaramuccia.com>
Mon, 2 Oct 2017 20:49:42 +0000 (22:49 +0200)
lib/filestorage/file_storage.php

index a9bfea5..15b4ef4 100644 (file)
@@ -1326,7 +1326,7 @@ class file_storage {
             $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 @@ class file_storage {
             $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 @@ class file_storage {
             $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);