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

andrewnicols · andrewnicols · commit cb9494ddcc2e · 2019-07-18T08:25:34.000+08:00
diff --git a/files/converter/unoconv/classes/converter.php b/files/converter/unoconv/classes/converter.php
@@ -194,7 +194,9 @@ public function serve_test_document() {
 
         $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) [

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,9 @@ public function serve_test_document() {`
`194`	`194`
`195`	`195`	`$conversions = conversion::get_conversions_for_file($testdocx, $format);`
`196`	`196`	`foreach ($conversions as $conversion) {`
`197`		`- $conversion->delete();`
	`197`	`+ if ($conversion->get('id')) {`
	`198`	`+ $conversion->delete();`
	`199`	`+ }`
`198`	`200`	`}`
`199`	`201`
`200`	`202`	`$conversion = new conversion(0, (object) [`