Merge remote-tracking branch 'origin/master'

2026-06-17 03:59:28 +00:00 · 2018-05-15 13:54:44 +02:00
parent 5a10eada1d 8b89131502
commit 499e8d200b
1 changed files with 9 additions and 2 deletions
@@ -57,8 +57,15 @@ class DocumentLib
 			case 'application/vnd.ms-word':
 			case 'application/vnd.oasis.opendocument.text':
 			case 'text/plain':
-				$this->convert($filename, $outFile, 'pdf');
-				return success($outFile);
+				$ret = $this->convert($filename, $outFile, 'pdf');
+				if(isSuccess($ret))
+				{
+					return success($outFile);
+				}
+				else
+				{
+					return $ret;
+				}
 			case 'application/pdf':
 				return success($filename);
 			default: