Update of /home/spip-cvs/spip
In directory alan:/tmp/cvs-serv30077
Modified Files:
spip_image.php3 spip_image_reduite.php3
Log Message:
mechants warning sur getimagesize (rezo.net)
Index: spip_image.php3
RCS file: /home/spip-cvs/spip/spip_image.php3,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- spip_image.php3 24 Oct 2004 06:24:33 -0000 1.110
+++ spip_image.php3 24 Oct 2004 13:13:30 -0000 1.111
@@ -314,7 +314,7 @@
if(preg_match("/\.(png)/i", $imagePath)) $src_img=ImageCreateFromPNG($imagePath);
elseif(preg_match("/\.(jpg)/i", $imagePath)) $src_img=ImageCreateFromJPEG($imagePath);
elseif(preg_match("/\.(bmp)/i", $imagePath)) $src_img=ImageCreateFromWBMP($imagePath);
- $size=GetImageSize($imagePath);
+ $size=@getimagesize($imagePath);
//note: to make it work on GD 2.xx properly change ImageCreate to ImageCreateTrueColor
$process = lire_meta('image_process');
Index: spip_image_reduite.php3
RCS file: /home/spip-cvs/spip/spip_image_reduite.php3,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- spip_image_reduite.php3 22 Oct 2004 21:48:04 -0000 1.9
+++ spip_image_reduite.php3 24 Oct 2004 13:13:30 -0000 1.10
@@ -25,7 +25,7 @@
//echo "<img src='$vignette' name='$name' border='0' align='$align' alt='' hspace='$espace' vspace='$espace' width='$width' height='$height' class='spip_logos' />";
$retour = $vignette;
}
- else if ($taille_origine = getimagesize($logo)) {
+ else if ($taille_origine = @getimagesize($logo)) {
//list ($destWidth,$destHeight) = image_ratio($taille_origine[0], $taille_origine[1], $taille_x, $taille_y);
$retour = $logo;
}