diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-09-22 22:09:56 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-09-22 22:09:56 -0700 |
| commit | d2bf5c9d1f28e90223b484addd6969c46f3160b5 (patch) | |
| tree | e30605417acaabd64f1c23c9fb53fd85aaeedb08 /modules/gallery/helpers/graphics.php | |
| parent | 3a9bdebafda1807bb2294c041e655f6464841bf0 (diff) | |
| parent | 7116f820ca2b6338abdca233a4b1d42d29a41150 (diff) | |
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/gallery/helpers/graphics.php')
| -rw-r--r-- | modules/gallery/helpers/graphics.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php index 2868a28d..dd521d84 100644 --- a/modules/gallery/helpers/graphics.php +++ b/modules/gallery/helpers/graphics.php @@ -313,11 +313,10 @@ class graphics_Core { $toolkits->graphicsmagick->installed = false; $toolkits->graphicsmagick->error = t("GraphicsMagick requires the <b>exec</b> function"); } else { - $graphics_path = module::get_var("gallery", "graphics_toolkit_path", null); - $extra_binary_paths = module::get_var("gallery", "extra_binary_paths", null); - - putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") . - ":" . $extra_binary_paths); + gallery::set_path_env( + array(module::get_var("gallery", "graphics_toolkit_path"), + getenv("PATH"), + module::get_var("gallery", "extra_binary_paths"))); // @todo: consider refactoring the two segments below into a loop since they are so // similar. |