Merge remote-tracking branch 'origin/master'

application/libraries/DocumentLib.php

@@ -57,8 +57,19 @@ class DocumentLib
 			case 'application/vnd.ms-word':
 			case 'application/vnd.oasis.opendocument.text':
 			case 'text/plain':
-				$this->convert($filename, $outFile, 'pdf');
-				return success($outFile);
+				// Unoconv Version 0.6 seems to fail on converting TXT Files
+				if ($this->unoconv_version == '0.6')
+					return error();
+
+				$ret = $this->convert($filename, $outFile, 'pdf');
+				if(isSuccess($ret))
+				{
+					return success($outFile);
+				}
+				else
+				{
+					return error($ret->retval);
+				}
 			case 'application/pdf':
 				return success($filename);
 			default: