Ticket #14459: 14459.2.diff

src/wp-includes/class-wp-image-editor-gd.php

@@ -116 +116 @@
                 $this->update_size( $size[0], $size[1] );
                 $this->mime_type = $size['mime'];
 
+                if ( in_array( $this->mime_type, array( 'image/jpeg', 'image/tiff' ) ) ) {
+                        $exif = exif_read_data($this->file);
+
+                        $orientation = 0; 
+
+                        if ( isset($exif["Orientation"]) ) {
+                                $orientation = $exif["Orientation"];
+                        }
+                        elseif ( isset($exif["IFD0"]) && isset($exif["IFD0"]["Orientation"]) ) {
+                                $orientation = $exif["IFD0"]["Orientation"];
+                        }
+                        elseif ( isset($exif["COMPUTED"]) && isset($exif["COMPUTED"]["Orientation"]) ) {
+                                $orientation = $exif["COMPUTED"]["Orientation"];
+                        }
+
+                        switch($orientation) {
+                                case 3:
+                                        $this->rotate(180);
+                                break;
+
+                                case 6:
+                                        $this->rotate(-90);
+                                break;
+
+                                case 8:
+                                        $this->rotate(90);
+                                break;
+                        }
+                }
+
                 return $this->set_quality();
         }
 

src/wp-includes/class-wp-image-editor-imagick.php

@@ -154 +154 @@
                                 $this->image->setIteratorIndex(0);
 
                         $this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
+
+                        if ( is_callable( array( $this->image, 'setImageOrientation' ) ) ) {
+                                $orientation = $this->image->getImageOrientation();
+
+                                switch($orientation) { 
+                                        case imagick::ORIENTATION_BOTTOMRIGHT: 
+                                                $this->rotate(180);
+                                        break; 
+
+                                        case imagick::ORIENTATION_RIGHTTOP: 
+                                                $this->rotate(90);
+                                        break; 
+
+                                        case imagick::ORIENTATION_LEFTBOTTOM: 
+                                                $this->rotate(-90);
+                                        break; 
+                                } 
+
+                                $this->image->setImageOrientation(imagick::ORIENTATION_UNDEFINED);
+                        }
                 }
                 catch ( Exception $e ) {
                         return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );