mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-08-12 11:43:01 +02:00
Fixed Issue ID 0000593: *.jpeg support in PWG
git-svn-id: http://piwigo.org/svn/trunk@1635 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
@@ -116,7 +116,7 @@ if ($outputFormat == "png")
|
||||
header("Content-type: image/png");
|
||||
ImagePNG($image);
|
||||
}
|
||||
else if ($outputFormat == "jpg")
|
||||
else if (in_array($outputFormat, array("jpg", "jpeg")))
|
||||
{
|
||||
header("Content-type: image/jpeg");
|
||||
Imagejpeg($image);
|
||||
|
||||
@@ -116,7 +116,7 @@ if ($outputFormat == "png")
|
||||
header("Content-type: image/png");
|
||||
ImagePNG($image);
|
||||
}
|
||||
else if ($outputFormat == "jpg")
|
||||
else if (in_array($outputFormat, array("jpg", "jpeg")))
|
||||
{
|
||||
header("Content-type: image/jpeg");
|
||||
Imagejpeg($image);
|
||||
|
||||
@@ -116,7 +116,7 @@ if ($outputFormat == "png")
|
||||
header("Content-type: image/png");
|
||||
ImagePNG($image);
|
||||
}
|
||||
else if ($outputFormat == "jpg")
|
||||
else if (in_array($outputFormat, array("jpg", "jpeg")))
|
||||
{
|
||||
header("Content-type: image/jpeg");
|
||||
Imagejpeg($image);
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ function RatioResizeImg($path, $newWidth, $newHeight, $tn_ext)
|
||||
// extension of the picture filename
|
||||
$extension = get_extension($filename);
|
||||
|
||||
if ($extension == 'jpg' or $extension == 'JPG')
|
||||
if (in_array($extension, array('jpg', 'JPG', 'jpeg', 'JPEG')))
|
||||
{
|
||||
$srcImage = @imagecreatefromjpeg($path);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user