Ticket #33051: 33051.diff

includes/file.php

@@ -384 +384 @@
                 'file' => $new_file,
                 'url'  => $url,
                 'type' => $type
-        ), 'wp_handle_sideload' === $action ? 'sideload' : 'upload' ); }
+        ), 'wp_handle_sideload' === $action ? 'sideload' : 'upload' );
+}
 
 /**
  * Wrapper for _wp_handle_upload(), passes 'wp_handle_upload' action.
@@ -415 +416 @@
 }
 
 /**
+ * On successful upload of a new image, check to see if it has an orientation.
+ * Orientations are only respected on some browsers, and can cause images to
+ * display incorrectly, so we auto-rotate everything to be upright.
+ *
+ * @since 4.4
+ *
+ * @param array  $file {
+ *     Array of upload data.
+ *
+ *     @type string $file Filepath of the newly-uploaded file.
+ *     @type string $url  URL of the uploaded file.
+ *     @type string $type File mime.
+ * }
+ */
+add_filter( 'wp_handle_upload', 'wp_maybe_rotate_image', 1 );
+function wp_maybe_rotate_image( $file = array() ) {
+
+        //Not an image file
+        if( 0 !== strpos( $file[ 'type' ], 'image/' ) )
+                return $file;
+
+        //Read the EXIF data of the file
+        $meta = wp_read_image_metadata( $file[ 'file' ] );
+        
+        //No orientation in the file
+        if( empty( $meta ) || empty( $meta[ 'orientation' ] ) )
+                return $file;
+
+        //Orientation is saved as a numeral, corresponding to the below rotations
+        switch ( $meta[ 'orientation' ] ) {
+                case 3:
+                        $rotation = -180;
+                        break;
+                case 6:
+                        $rotation = -90;
+                        break;
+                case 8:
+                case 9:
+                        $rotation = -270;
+                        break;
+                default:
+                        $rotation = 0;
+                        break;
+        }
+        
+        //Unknown rotation, or none at all
+        if( empty( $rotation ) )
+                return $file;
+
+        //Load the file using ImageMagick or GD
+        //We test to make sure we can rotate the file using the given image editor
+        $editor = wp_get_image_editor( $file[ 'file' ], array( 'mime_type' => $file[ 'type' ], 'methods' => array( 'rotate' ) ) );
+
+        //No editor, or unable to edit this type of file
+        if( is_wp_error( $editor ) )
+                return $file;
+        
+        //Rotate the file the specified degrees and save it to its original location
+        if( !is_wp_error( $editor->rotate( $rotation ) ) )
+                $editor->save( '/home/wpdavis/webapps/trunk/wp-content/test.jpg', $file[ 'type' ] );
+
+        return $file;
+
+}
+
+/**
  * Wrapper for _wp_handle_upload(), passes 'wp_handle_sideload' action
  *
  * @since 2.6.0