Stream: Fixed the error of "File not supported" with exif checking

GibbonEdu · May 31, 2024 · a9f6707 · a9f6707
1 parent cafb7b4
commit a9f6707
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -36,6 +36,7 @@ v28.0.00
     Bug Fixes
         Admissions: fixed "Do not include a second parent" being accidentally checked by default
         Messenger: fixed error redirect for New Message sending users to a non-existing page
+        FileUploader: fixed the error shown when the FileUploader did an exif data check for some images
 
 v27.0.00
 --------

diff --git a/src/Gibbon/FileUploader.php b/src/Gibbon/FileUploader.php
@@ -277,7 +277,7 @@ public function uploadAndResizeImage($file, $filenameChange = '', $maxSize = 102
         }
 
         $this->resizeImage($file['tmp_name'], $file['tmp_name'], $maxSize, $quality);
-
+        
         return $this->uploadFromPost($file, $filenameChange);
     }
 
@@ -350,8 +350,8 @@ public function resizeImage($sourcePath, $destPath, $maxSize = 1024, $quality =
             imagecopyresampled($dst, $src, $destX, $destY, $srcX, $srcY, $destWidth, $destHeight, $srcWidth, $srcHeight);
 
             // Handle Exif rotation
-            if (function_exists('exif_read_data')) {
-                $exif = exif_read_data($sourcePath);
+            if (function_exists('exif_read_data') && in_array($extension, ['jpg', 'jpeg'])) {
+                $exif = @exif_read_data($sourcePath);
                 if (!empty($exif['Orientation'])) {
                     switch ($exif['Orientation']) {
                         case 3: