diff options
author | Derek Jones <derek.jones@ellislab.com> | 2011-08-26 23:31:44 +0200 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2011-08-26 23:31:44 +0200 |
commit | 84c3bf369497e33b600deaea20297e89e265047a (patch) | |
tree | 64f49bddb2b065f048664aed46ee7766d876fa9f /system/libraries | |
parent | be72bd2d1cdba222bbbce547e1603de1e4ec7961 (diff) | |
parent | b183ece10dcde599c04af412f0f5c1c776ed29d8 (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries')
-rw-r--r-- | system/libraries/Image_lib.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php index 8902f524d..a8a0387d8 100644 --- a/system/libraries/Image_lib.php +++ b/system/libraries/Image_lib.php @@ -1334,7 +1334,7 @@ class CI_Image_lib { return FALSE; } - $vals = @getimagesize($path); + $vals = getimagesize($path); $types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png'); |