Skip to content

Commit 95d03ad

Browse files
Merge pull request #10171 from phalcon/revert-10141-patch-1
Revert "Fixed checking case insensitive image extensions"
2 parents c4a3da5 + cd8f5f7 commit 95d03ad

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

phalcon/image/adapter/gd.zep

+5-6
Original file line numberDiff line numberDiff line change
@@ -497,9 +497,9 @@ class Gd extends \Phalcon\Image\Adapter implements \Phalcon\Image\AdapterInterfa
497497
{
498498
var ext;
499499

500-
let ext = strtolower(pathinfo(file, PATHINFO_EXTENSION));
500+
let ext = pathinfo(file, PATHINFO_EXTENSION);
501501

502-
if strcmp(ext, "gif") == 0 {
502+
if strcasecmp(ext, "gif") == 0 {
503503
let this->_type = 1;
504504
let this->_mime = image_type_to_mime_type(this->_type);
505505
imagegif(this->_image, file);
@@ -514,7 +514,7 @@ class Gd extends \Phalcon\Image\Adapter implements \Phalcon\Image\AdapterInterfa
514514
if strcmp(ext, "png") == 0 {
515515
let this->_type = 3;
516516
let this->_mime = image_type_to_mime_type(this->_type);
517-
imagepng(this->_image, file);
517+
imagejpeg(this->_image, file);
518518
return true;
519519
}
520520
if strcmp(ext, "wbmp") == 0 {
@@ -535,9 +535,8 @@ class Gd extends \Phalcon\Image\Adapter implements \Phalcon\Image\AdapterInterfa
535535

536536
protected function _render(string ext, int quality)
537537
{
538-
let ext = strtolower(ext);
539538
ob_start();
540-
if strcmp(ext, "gif") == 0 {
539+
if strcasecmp(ext, "gif") == 0 {
541540
imagegif(this->_image);
542541
return ob_get_clean();
543542
}
@@ -546,7 +545,7 @@ class Gd extends \Phalcon\Image\Adapter implements \Phalcon\Image\AdapterInterfa
546545
return ob_get_clean();
547546
}
548547
if strcmp(ext, "png") == 0 {
549-
imagepng(this->_image);
548+
imagejpeg(this->_image);
550549
return ob_get_clean();
551550
}
552551
if strcmp(ext, "wbmp") == 0 {

0 commit comments

Comments
 (0)