Include the graphics_toolkit_path from the advanced settings in the p…

…ath when searching for the graphics toolkits directories. Fixes ticket #639
gallery · Oct 30, 2009 · 2942152 · 2942152
1 parent 59b5a05
commit 2942152
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
@@ -278,7 +278,10 @@ static function detect_toolkits() {
       $toolkits->graphicsmagick->installed = false;
       $toolkits->graphicsmagick->error = t("GraphicsMagick requires the <b>exec</b> function");
     } else {
-      putenv("PATH=" . getenv("PATH") . ":/usr/local/bin:/opt/local/bin:/opt/bin");
+      $graphics_path = module::get_var("gallery", "graphics_toolkit_path", null);
+
+      putenv("PATH=" . getenv("PATH") . (empty($graphics_path) ? "" : ":$graphics_path") .
+             ":/usr/local/bin:/opt/local/bin:/opt/bin");
 
       // @todo: consider refactoring the two segments below into a loop since they are so
       // similar.