diff options
| author | Michael Foster <savetheinternet@tinyboard.org> | 2013-08-03 00:28:54 -0400 |
|---|---|---|
| committer | Michael Foster <savetheinternet@tinyboard.org> | 2013-08-03 00:28:54 -0400 |
| commit | 784c3ffadbc28b7f6d6a1808a1f1d71e957cb089 (patch) | |
| tree | eaff7f06a0ea80098606daa3de517e1d929782c6 /inc/image.php | |
| parent | 1d37e81adeea9b2a1bc1028f2bf45b47ac045ec4 (diff) | |
Accidentally commit'd debug stuff/errors
Diffstat (limited to 'inc/image.php')
| -rw-r--r-- | inc/image.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/image.php b/inc/image.php index 4fc9d018..88f735dd 100644 --- a/inc/image.php +++ b/inc/image.php @@ -289,12 +289,12 @@ class ImageConvert extends ImageBase { escapeshellarg($this->temp) . '2>&1 &&echo $?') !== '0') || !file_exists($this->temp)) error('Failed to resize image!', null, $error); } else { - if (trim($error = shell_exec('aconvert ' . sprintf($config['convert_args'], '', $this->width, $this->height) . ' ' . + if (trim($error = shell_exec('convert ' . sprintf($config['convert_args'], '', $this->width, $this->height) . ' ' . escapeshellarg($this->src) . ' ' . escapeshellarg($this->temp) . ' 2>&1 &&echo $?')) !== '0' || !file_exists($this->temp)) error('Failed to resize image!', null, $error); } } else { - if (trim($error = shell_exec('aconvert ' . sprintf($config['convert_args'], '-flatten', $this->width, $this->height) . ' ' . + if (trim($error = shell_exec('convert ' . sprintf($config['convert_args'], '-flatten', $this->width, $this->height) . ' ' . escapeshellarg($this->src . '[0]') . " " . escapeshellarg($this->temp) . ' 2>&1 &&echo $?')) !== '0' || !file_exists($this->temp)) error('Failed to resize image!', null, $error); } |