From: moodler <moodler>
Date: Mon, 19 May 2003 03:27:13 +0000 (+0000)
Subject: Some fixes for check_gd_version -- please test this for me on every server you have!
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3ee236820a51f8b44b53d132fb8e73187c3073c8;p=moodle.git

Some fixes for check_gd_version -- please test this for me on every server you have!
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index d31a8357f6..62a1309d43 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1256,10 +1256,12 @@ function check_gd_version() {
 
     if (function_exists('gd_info')){
         $gd_info = gd_info();
-        /// THIS IS UGLY AND NEEDS TO BE IMPROVED
-        if($gd_info['GD Version'] == 'bundled (2.0 compatible)'){
+        if (substr_count($gd_info['GD Version'], "2.")) {
             $gdversion = 2;
+        } else if (substr_count($gd_info['GD Version'], "1.")) {
+            $gdversion = 1;
         }
+
     } else {
         ob_start();
         phpinfo(8);