summaryrefslogtreecommitdiff
path: root/modules/gallery/helpers/graphics.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-09-17 17:48:20 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-09-17 17:48:20 -0700
commit38be33ef35cd5e67bf37aa0101d1948b6dc27ed0 (patch)
tree875c02a2bf9d311546060c89baaf74098de96937 /modules/gallery/helpers/graphics.php
parent207d848989880edbbbbc852a366bf3bbaf505d2a (diff)
parent3e1743b21fd35b9d6d540e827292f1f4f006b531 (diff)
Merge branch 'master' into talmdal_dev
Diffstat (limited to 'modules/gallery/helpers/graphics.php')
-rw-r--r--modules/gallery/helpers/graphics.php3
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.