diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-10-06 21:13:35 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-10-06 21:13:35 +0000 |
| commit | 7dae93afeb449193415d1537ffbd4831cb6fe88f (patch) | |
| tree | 80534daddd72b51f370942ca16b483b479a6e6c2 /modules/gallery/helpers/graphics.php | |
| parent | 46ba61da0ffd1fc15899d51bcd2a6ba70c831900 (diff) | |
| parent | ea5a4e6cfed888a562216e24125d7b703393bc67 (diff) | |
git-pulled, but had to manuall fix some conflicts.
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. |