From d134073bff4753e7c9025a7106dd92a7283b8988 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 14 May 2003 13:12:15 +0000
Subject: [PATCH] bug 736111

---
 ChangeLog                      |  3 +++
 libraries/defines_php.lib.php3 | 11 +++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0561157c0..1fa3fcdfb 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-05-14 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/defines_php.lib.php3: bug 736111: better GD2 detection
+
 2003-05-14 Garvin Hicking <me@supergarv.de>
     * lang/german*: Translations.
     * pdf_schema.php3: Merged patch #736999 (fixes Bug #728789 and
diff --git a/libraries/defines_php.lib.php3 b/libraries/defines_php.lib.php3
index 04040a11a..15af53393 100644
--- a/libraries/defines_php.lib.php3
+++ b/libraries/defines_php.lib.php3
@@ -64,14 +64,9 @@ if (!defined('PMA_IS_WINDOWS')) {
 
 // Whether GD2 is present
 if (!defined('PMA_IS_GD2')) {
-    if (function_exists("get_extension_funcs")) {
-        $testGD = @get_extension_funcs("gd");
-        if ($testGD && in_array("imagegd2",$testGD)) {
-            define('PMA_IS_GD2', 1);
-        } else {
-            define('PMA_IS_GD2', 0);
-        }
-        unset($testGD);
+    $testGD = @imagecreatetruecolor(12,12);
+    if ($testGD) {
+        define('PMA_IS_GD2', 1);
     } else {
         define('PMA_IS_GD2', 0);
     }