nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 736111

Browse Source
This commit is contained in:
Marc Delisle
2003-05-14 13:12:15 +00:00
parent 6c29940d62
commit d134073bff
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $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> 2003-05-14 Garvin Hicking <me@supergarv.de>
* lang/german*: Translations. * lang/german*: Translations.
* pdf_schema.php3: Merged patch #736999 (fixes Bug #728789 and * pdf_schema.php3: Merged patch #736999 (fixes Bug #728789 and

11
libraries/defines_php.lib.php3
View File

@@ -64,14 +64,9 @@ if (!defined('PMA_IS_WINDOWS')) {
// Whether GD2 is present // Whether GD2 is present
if (!defined('PMA_IS_GD2')) { if (!defined('PMA_IS_GD2')) {
if (function_exists("get_extension_funcs")) { $testGD = @imagecreatetruecolor(12,12);
$testGD = @get_extension_funcs("gd"); if ($testGD) {
if ($testGD && in_array("imagegd2",$testGD)) { define('PMA_IS_GD2', 1);
define('PMA_IS_GD2', 1);
} else {
define('PMA_IS_GD2', 0);
}
unset($testGD);
} else { } else {
define('PMA_IS_GD2', 0); define('PMA_IS_GD2', 0);
} }