diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-01-02 09:14:58 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-01-02 09:14:58 -0800 |
| commit | 20496cff64771ce532317c9bb03d0b0942c86334 (patch) | |
| tree | 3b46e36b2d926e928122c1d2b2bb72cd1c3fe953 | |
| parent | dc3fd9d037871a3ac8b28ab859302ee6ceca3844 (diff) | |
| parent | ff6688b48b2eb083f82d803249f61dc08efb5b92 (diff) | |
Merge pull request #84 from shadlaws/master
#1919 - change `convert -v` to `convert -version`
| -rw-r--r-- | modules/gallery/helpers/graphics.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php index c7f87403..bfc0085d 100644 --- a/modules/gallery/helpers/graphics.php +++ b/modules/gallery/helpers/graphics.php @@ -335,7 +335,7 @@ class graphics_Core { // ImageMagick & GraphicsMagick $magick_kits = array( "imagemagick" => array( - "name" => "ImageMagick", "binary" => "convert", "version_arg" => "-v", + "name" => "ImageMagick", "binary" => "convert", "version_arg" => "-version", "version_regex" => "/Version: \S+ (\S+)/"), "graphicsmagick" => array( "name" => "GraphicsMagick", "binary" => "gm", "version_arg" => "version", |