diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-09-16 20:43:48 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-09-16 20:43:48 -0700 |
| commit | 3e1743b21fd35b9d6d540e827292f1f4f006b531 (patch) | |
| tree | 07a7b5fbd34c076fb2c2757eb65330cc51f150b3 /modules/gallery/helpers/graphics.php | |
| parent | 64dfccc4eddf204a80ce533bad69ac8c0c83c1bd (diff) | |
Add a module variable containing extra paths to search for binaries.
Fixes ticket #1384.
Diffstat (limited to 'modules/gallery/helpers/graphics.php')
| -rw-r--r-- | modules/gallery/helpers/graphics.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php index bb085ea5..2868a28d 100644 --- a/modules/gallery/helpers/graphics.php +++ b/modules/gallery/helpers/graphics.php @@ -314,9 +314,10 @@ class graphics_Core { $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") . - ":/usr/local/bin:/opt/local/bin:/opt/bin"); + ":" . $extra_binary_paths); // @todo: consider refactoring the two segments below into a loop since they are so // similar. |