diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-09-22 21:35:49 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-09-22 21:35:49 -0700 |
| commit | 790bf4e871b1a1555dc32287ab222b6694d402a2 (patch) | |
| tree | d1b455bdc14e05fc512351ec17bc47b1449333f6 /modules/gallery/helpers/graphics.php | |
| parent | 3b8475908feded1a982cf9a7e43e0dd18755c470 (diff) | |
Prioritize using the value in graphics_toolkit_path over the standard
path so that if you change that value in Admin > Settings > Advanced
we prefer it over other paths (which may be restricted by
open_basedir). Fixes #1395.
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. |