Merge branch 'MDL-59911-conv_cleanup_check-37' of git://github.com/leonstr/moodle into MOODLE_37_STABLE

2019-07-18 08:25:34 +08:00
parent 6fad97a975 c4e1a1518c
commit cb9494ddcc
1 changed files with 3 additions and 1 deletions
@@ -194,7 +194,9 @@ class converter implements \core_files\converter_interface {

        $conversions = conversion::get_conversions_for_file($testdocx, $format);
        foreach ($conversions as $conversion) {
-            $conversion->delete();
+            if ($conversion->get('id')) {
+                $conversion->delete();
+            }
        }

        $conversion = new conversion(0, (object) [