From 04fe9da19036a657aeeee11f6c3641f98a345323 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Thu, 5 Feb 2009 23:29:44 +0000 Subject: Addressed the issues in ticket 34. Surround the the attempt to use gd_info with a try catch block. Created a new class gInstalledToolkit which has the highlighting and the over pointer definition. Now if you mouse across an inactive toolkit it remains inert. --- core/helpers/graphics.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'core/helpers/graphics.php') diff --git a/core/helpers/graphics.php b/core/helpers/graphics.php index 9954bf22..cd112e1b 100644 --- a/core/helpers/graphics.php +++ b/core/helpers/graphics.php @@ -236,7 +236,12 @@ class graphics_Core { * GraphicsMagick we return the path to the directory containing the appropriate binaries. */ static function detect_toolkits() { - return array("gd" => function_exists("gd_info") ? gd_info() : array(), + try { + $gd = function_exists("gd_info") ? gd_info() : array(); + } catch (Exception $e) { + $gd = array(); + } + return array("gd" => $gd, "imagemagick" => dirname(exec("which convert")), "graphicsmagick" => dirname(exec("which gm"))); } -- cgit v1.2.3