From 694f3b74c7def644bc837f0df724dcdc0c456b85 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Fri, 14 Oct 2011 15:30:54 +0200 Subject: [PATCH] MDL-29773 use db debuginfo when file record insertion fails --- lib/filestorage/file_storage.php | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/lib/filestorage/file_storage.php b/lib/filestorage/file_storage.php index 180bb0b32b7..713bd3f9312 100644 --- a/lib/filestorage/file_storage.php +++ b/lib/filestorage/file_storage.php @@ -673,12 +673,8 @@ class file_storage { try { $newrecord->id = $DB->insert_record('files', $newrecord); } catch (dml_exception $e) { - $newrecord->id = false; - } - - if (!$newrecord->id) { throw new stored_file_creation_exception($newrecord->contextid, $newrecord->component, $newrecord->filearea, $newrecord->itemid, - $newrecord->filepath, $newrecord->filename); + $newrecord->filepath, $newrecord->filename, $e->debuginfo); } $this->create_directory($newrecord->contextid, $newrecord->component, $newrecord->filearea, $newrecord->itemid, $newrecord->filepath, $newrecord->userid); @@ -820,15 +816,11 @@ class file_storage { try { $newrecord->id = $DB->insert_record('files', $newrecord); } catch (dml_exception $e) { - $newrecord->id = false; - } - - if (!$newrecord->id) { if ($newfile) { $this->deleted_file_cleanup($newrecord->contenthash); } throw new stored_file_creation_exception($newrecord->contextid, $newrecord->component, $newrecord->filearea, $newrecord->itemid, - $newrecord->filepath, $newrecord->filename); + $newrecord->filepath, $newrecord->filename, $e->debuginfo); } $this->create_directory($newrecord->contextid, $newrecord->component, $newrecord->filearea, $newrecord->itemid, $newrecord->filepath, $newrecord->userid); @@ -915,15 +907,11 @@ class file_storage { try { $newrecord->id = $DB->insert_record('files', $newrecord); } catch (dml_exception $e) { - $newrecord->id = false; - } - - if (!$newrecord->id) { if ($newfile) { $this->deleted_file_cleanup($newrecord->contenthash); } throw new stored_file_creation_exception($newrecord->contextid, $newrecord->component, $newrecord->filearea, $newrecord->itemid, - $newrecord->filepath, $newrecord->filename); + $newrecord->filepath, $newrecord->filename, $e->debuginfo); } $this->create_directory($newrecord->contextid, $newrecord->component, $newrecord->filearea, $newrecord->itemid, $newrecord->filepath, $newrecord->userid); -- 2.11.4.GIT