archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature:2284

Browse source 
Avoid error when spaces are present in dirname.

git-svn-id: http://piwigo.org/svn/trunk@10713 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2011-05-01 10:10:45 +00:00
parent 0db141fc62
commit 62d5bcd749
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
admin/include/image.class.php
View file

@ -406,7 +406,7 @@ class image_ext_imagick implements imageInterface
$this->source_filepath = $source_filepath;
$this->imagickdir = $imagickdir;
$command = $imagickdir."identify -verbose ".realpath($source_filepath);
$command = $imagickdir.'identify -verbose "'.realpath($source_filepath).'"';
@exec($command, $returnarray, $returnvalue);
if($returnvalue)
{
@ -476,7 +476,7 @@ class image_ext_imagick implements imageInterface
function write($destination_filepath)
{
$exec = $this->imagickdir.'convert';
$exec .= ' '.realpath($this->source_filepath);
$exec .= ' "'.realpath($this->source_filepath).'"';
foreach ($this->commands as $command => $params)
{
@ -488,7 +488,7 @@ class image_ext_imagick implements imageInterface
}
$dest = pathinfo($destination_filepath);
$exec .= ' '.realpath($dest['dirname']).'/'.$dest['basename'];
$exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
@exec($exec, $returnarray, $returnvalue);
return !$returnvalue;
}