Skip to content
Permalink
Browse files

Fix EZP-21883: Regression from ezp-21357 with images with utf-8 names

  • Loading branch information...
yannickroger committed Nov 7, 2013
1 parent e5a1776 commit c966b94634b430f17d337595a08e635acc4ef877
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/ezimage/classes/ezimageshellhandler.php
@@ -71,8 +71,8 @@ function convert( $manager, $sourceMimeData, &$destinationMimeData, $filters = f
// Still expand File*.jpg as the shell would do, however, this is only true for the file's basename part and not
// for the whole path.
$argumentList[] = eZSys::escapeShellArgument(
dirname( $sourceMimeData['url'] ) . DIRECTORY_SEPARATOR . addcslashes(
basename( $sourceMimeData['url'] ),
$sourceMimeData['dirpath'] . DIRECTORY_SEPARATOR . addcslashes(
$sourceMimeData['filename'],
// ImageMagick meta-characters
'~*?[]{}<>'
)

0 comments on commit c966b94

Please sign in to comment.
You can’t perform that action at this time.