summaryrefslogtreecommitdiffstats
path: root/system/libraries/Image_lib.php
diff options
context:
space:
mode:
authorGreg Aker <greg@gregaker.net>2011-08-30 02:31:48 +0200
committerGreg Aker <greg@gregaker.net>2011-08-30 02:31:48 +0200
commitb50df5f018176c0cd0ad498e9c710a2b0b016a80 (patch)
tree95733dbbcc348a92aad5d979db2e5da471859c25 /system/libraries/Image_lib.php
parentc964e72aabc3a646dbb82f6bf609e9532e75d011 (diff)
parentd7a28663344fbb760134b5623b8cb441f4875f80 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/libraries/Image_lib.php')
-rw-r--r--system/libraries/Image_lib.php2
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');