summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2008-03-05 17:22:31 +0100
committerDerek Allard <derek.allard@ellislab.com>2008-03-05 17:22:31 +0100
commit4acd41aaa0e70577ab179a3a81d485ac2ab27523 (patch)
tree02227233267911e7298cae663f6427ef1e1427e3
parent49ef042b211b41e4a24815bbf6fd65fb41f86021 (diff)
restore a comment
-rw-r--r--system/libraries/Image_lib.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index dbb6f82e0..395742092 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -499,8 +499,14 @@ class CI_Image_lib {
return FALSE;
}
- // Create The Image
- if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor'))
+ // Create The Image
+ //
+ // old conditional which users report cause problems with shared GD libs who report themselves as "2.0 or greater"
+ // it appears that this is no longer the issue that it was in 2004, so we've removed it, retaining it in the comment
+ // below should that ever prove inaccurate.
+ //
+ // if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor') AND $v2_override == FALSE)
+ if ($this->image_library == 'gd2' AND function_exists('imagecreatetruecolor'))
{
$create = 'imagecreatetruecolor';
$copy = 'imagecopyresampled';