diff options
| author | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-09-29 22:01:36 +0300 |
|---|---|---|
| committer | mamouneyya <mamoun.diraneyya@gmail.com> | 2010-09-29 22:01:36 +0300 |
| commit | 6aabab4b715ff8ac00cc667e9d0a40c9868410d8 (patch) | |
| tree | 85766ce290f3a89b1039969ce31bc47138d76594 /modules/gallery/helpers/graphics.php | |
| parent | 61e55becf46ce899632bff7ce26a7208094618f0 (diff) | |
| parent | ef8751468b998baddbc6d5827a392ed6e12e5548 (diff) | |
Merge remote branch 'gallery3/master'
Conflicts:
themes/admin_wind/css/screen.css
themes/wind/css/screen.css
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. |