diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2011-04-23 10:08:48 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2011-04-23 10:08:48 -0700 |
| commit | 01055fb54f717b811474592a22d82ba66a4f1865 (patch) | |
| tree | 9b48e51a67fce1a9f47afbbcee5c8bcf12291f4b /modules/gallery/helpers | |
| parent | 76a7ad3161be0994d7ba98e9dff9b317b2430bb3 (diff) | |
| parent | 563a25f559a0247b2e3f4e96b191e7138c8e8ea5 (diff) | |
Merge branch 'master' of github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers')
| -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 d19392cf..8d8853b0 100644 --- a/modules/gallery/helpers/graphics.php +++ b/modules/gallery/helpers/graphics.php @@ -316,7 +316,7 @@ class graphics_Core { // ImageMagick & GraphicsMagick $magick_kits = array( "imagemagick" => array( - "name" => "ImageMagick", "binary" => "convert", "version" => "convert -v", + "name" => "ImageMagick", "binary" => "convert", "version" => "convert -version", "version_regex" => "/Version: \S+ (\S+)/"), "graphicsmagick" => array( "name" => "GraphicsMagick", "binary" => "gm", "version" => "gm version", |