Merge pull request #964 from sespivak/develop

cdujeu · cdujeu · commit 9370ee1139da · 2015-10-24T09:26:39.000+02:00
fix preview with unoconv of files with russian names
diff --git a/core/src/plugins/editor.imagick/class.IMagickPreviewer.php b/core/src/plugins/editor.imagick/class.IMagickPreviewer.php
@@ -281,6 +281,7 @@ public function generateJpegsCallback($masterFile, $targetFile)
                 } else {
                     $unoconv =  "HOME=/tmp ".$unoconv." --stdout -f pdf ".escapeshellarg($masterFile)." > ".escapeshellarg(basename($unoDoc));
                 }
+                putenv('LC_CTYPE='.AJXP_LOCALE);
                 exec($unoconv, $out, $return);
             }
             if (is_file($unoDoc)) {

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,7 @@ public function generateJpegsCallback($masterFile, $targetFile)`
`281`	`281`	`} else {`
`282`	`282`	`$unoconv = "HOME=/tmp ".$unoconv." --stdout -f pdf ".escapeshellarg($masterFile)." > ".escapeshellarg(basename($unoDoc));`
`283`	`283`	`}`
	`284`	`+ putenv('LC_CTYPE='.AJXP_LOCALE);`
`284`	`285`	`exec($unoconv, $out, $return);`
`285`	`286`	`}`
`286`	`287`	`if (is_file($unoDoc)) {`