]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-admin/includes/image-edit.php
WordPress 4.6.3
[autoinstalls/wordpress.git] / wp-admin / includes / image-edit.php
index b15575ae3d3a51f4504d62694836e7d2dc9d5ba7..928cd1357f7b39831c6d251b546b018573ea0fa0 100644 (file)
@@ -6,6 +6,13 @@
  * @subpackage Administration
  */
 
  * @subpackage Administration
  */
 
+/**
+ * Loads the WP image-editing interface.
+ *
+ * @param int         $post_id Post ID.
+ * @param bool|object $msg     Optional. Message to display for image editor updates or errors.
+ *                             Default false.
+ */
 function wp_image_editor($post_id, $msg = false) {
        $nonce = wp_create_nonce("image_editor-$post_id");
        $meta = wp_get_attachment_metadata($post_id);
 function wp_image_editor($post_id, $msg = false) {
        $nonce = wp_create_nonce("image_editor-$post_id");
        $meta = wp_get_attachment_metadata($post_id);
@@ -13,7 +20,7 @@ function wp_image_editor($post_id, $msg = false) {
        $sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
        $note = '';
 
        $sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
        $note = '';
 
-       if ( is_array($meta) && isset($meta['width']) )
+       if ( isset( $meta['width'], $meta['height'] ) )
                $big = max( $meta['width'], $meta['height'] );
        else
                die( __('Image data does not exist. Please re-upload the image.') );
                $big = max( $meta['width'], $meta['height'] );
        else
                die( __('Image data does not exist. Please re-upload the image.') );
@@ -21,8 +28,9 @@ function wp_image_editor($post_id, $msg = false) {
        $sizer = $big > 400 ? 400 / $big : 1;
 
        $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
        $sizer = $big > 400 ? 400 / $big : 1;
 
        $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
-       $can_restore = !empty($backup_sizes) && isset($backup_sizes['full-orig'])
-               && $backup_sizes['full-orig']['file'] != basename($meta['file']);
+       $can_restore = false;
+       if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) )
+               $can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
 
        if ( $msg ) {
                if ( isset($msg->error) )
 
        if ( $msg ) {
                if ( isset($msg->error) )
@@ -32,122 +40,104 @@ function wp_image_editor($post_id, $msg = false) {
        }
 
        ?>
        }
 
        ?>
-       <div class="imgedit-wrap">
-       <?php echo $note; ?>
-       <table id="imgedit-panel-<?php echo $post_id; ?>"><tbody>
-       <tr><td>
-       <div class="imgedit-menu">
-               <div onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop disabled" title="<?php esc_attr_e( 'Crop' ); ?>"></div><?php
-
-       if ( function_exists('imagerotate') ) { ?>
-
-               <div onclick="imageEdit.rotate(90, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-rleft" title="<?php esc_attr_e( 'Rotate couter-clockwise' ); ?>"></div>
-               <div onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-rright" title="<?php esc_attr_e( 'Rotate clockwise' ); ?>"></div><?php
-
-       } ?>
-
-               <div onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv" title="<?php esc_attr_e( 'Flip vertically' ); ?>"></div>
-               <div onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph" title="<?php esc_attr_e( 'Flip horizontally' ); ?>"></div>
-
-               <div id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo disabled" title="<?php esc_attr_e( 'Undo' ); ?>"></div>
-               <div id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo disabled" title="<?php esc_attr_e( 'Redo' ); ?>"></div>
-               <br class="clear" />
-       </div>
+       <div class="imgedit-wrap wp-clearfix">
+       <div id="imgedit-panel-<?php echo $post_id; ?>">
 
 
-       <input type="hidden" id="imgedit-sizer-<?php echo $post_id; ?>" value="<?php echo $sizer; ?>" />
-       <input type="hidden" id="imgedit-minthumb-<?php echo $post_id; ?>" value="<?php echo ( get_option('thumbnail_size_w') . ':' . get_option('thumbnail_size_h') ); ?>" />
-       <input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
-       <input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
-       <input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
-       <input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo $meta['width']; ?>" />
-       <input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo $meta['height']; ?>" />
-
-       <div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
-       <img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url('admin-ajax.php'); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" />
-       </div>
-
-       <div class="imgedit-submit">
-               <input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button" value="<?php esc_attr_e( 'Cancel' ); ?>" />
-               <input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button-primary imgedit-submit-btn" value="<?php esc_attr_e( 'Save' ); ?>" />
-       </div>
-       </td>
-
-       <td class="imgedit-settings">
+       <div class="imgedit-settings">
        <div class="imgedit-group">
        <div class="imgedit-group-top">
        <div class="imgedit-group">
        <div class="imgedit-group-top">
-               <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><strong><?php _e('Scale Image'); ?></strong></a>
+               <h2><?php _e( 'Scale Image' ); ?></h2>
+               <button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Scale Image Help' ); ?></span></button>
                <div class="imgedit-help">
                <div class="imgedit-help">
-               <p><?php _e('You can proportionally scale the original image. For best results the scaling should be done before performing any other operations on it like crop, rotate, etc. Note that if you make the image larger it may become fuzzy.'); ?></p>
-               <p><?php printf( __('Original dimensions %s'), $meta['width'] . '&times;' . $meta['height'] ); ?></p>
-               <div class="imgedit-submit">
-               <span class="nowrap"><input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" style="width:4em;" value="<?php echo $meta['width']; ?>" />&times;<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" style="width:4em;" value="<?php echo $meta['height']; ?>" />
-               <span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span></span>
-               <input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
+               <p><?php _e('You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.'); ?></p>
                </div>
                </div>
+               <?php if ( isset( $meta['width'], $meta['height'] ) ): ?>
+               <p><?php printf( __('Original dimensions %s'), $meta['width'] . ' &times; ' . $meta['height'] ); ?></p>
+               <?php endif ?>
+               <div class="imgedit-submit">
+
+               <fieldset class="imgedit-scale">
+               <legend><?php _e( 'New dimensions:' ); ?></legend>
+               <div class="nowrap">
+               <label><span class="screen-reader-text"><?php _e( 'scale width' ); ?></span>
+               <input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1, this)" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
+               </label>
+               <span class="imgedit-separator">&times;</span>
+               <label><span class="screen-reader-text"><?php _e( 'scale height' ); ?></span>
+               <input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0, this)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+               </label>
+               <span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
+               <input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
+               </div>
+               </fieldset>
+
                </div>
        </div>
                </div>
        </div>
+       </div>
 
 <?php if ( $can_restore ) { ?>
 
 
 <?php if ( $can_restore ) { ?>
 
+       <div class="imgedit-group">
        <div class="imgedit-group-top">
        <div class="imgedit-group-top">
-               <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><strong><?php _e('Restore Original Image'); ?></strong></a>
+               <h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link"><?php _e( 'Restore Original Image' ); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
                <div class="imgedit-help">
                <div class="imgedit-help">
-               <p><?php _e('Discard any changes and restore the original image.'); 
+               <p><?php _e('Discard any changes and restore the original image.');
 
                if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
 
                if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
-                       _e(' Previously edited copies of the image will not be deleted.');
+                       echo ' '.__('Previously edited copies of the image will not be deleted.');
 
                ?></p>
                <div class="imgedit-submit">
 
                ?></p>
                <div class="imgedit-submit">
-               <input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
+               <input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
                </div>
                </div>
        </div>
                </div>
                </div>
        </div>
+       </div>
 
 <?php } ?>
 
 
 <?php } ?>
 
-       </div>
-
        <div class="imgedit-group">
        <div class="imgedit-group-top">
        <div class="imgedit-group">
        <div class="imgedit-group-top">
-               <strong><?php _e('Image Crop'); ?></strong>
-               <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><?php _e('(help)'); ?></a>
+               <h2><?php _e( 'Image Crop' ); ?></h2>
+               <button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Image Crop Help' ); ?></span></button>
+
                <div class="imgedit-help">
                <div class="imgedit-help">
-               <p><?php _e('The image can be cropped by clicking on it and dragging to select the desired part. While dragging the dimensions of the selection are displayed below.'); ?></p>
-               <strong><?php _e('Keyboard shortcuts'); ?></strong>
-               <ul>
-               <li><?php _e('Arrow: move by 10px'); ?></li>
-               <li><?php _e('Shift + arrow: move by 1px'); ?></li>
-               <li><?php _e('Ctrl + arrow: resize by 10px'); ?></li>
-               <li><?php _e('Ctrl + Shift + arrow: resize by 1px'); ?></li>
-               <li><?php _e('Shift + drag: lock aspect ratio'); ?></li>
-               </ul>
+               <p><?php _e('To crop the image, click on it and drag to make your selection.'); ?></p>
 
                <p><strong><?php _e('Crop Aspect Ratio'); ?></strong><br />
 
                <p><strong><?php _e('Crop Aspect Ratio'); ?></strong><br />
-               <?php _e('You can specify the crop selection aspect ratio then hold down the Shift key while dragging to lock it. The values can be 1:1 (square), 4:3, 16:9, etc. If there is a selection, specifying aspect ratio will set it immediately.'); ?></p>
+               <?php _e('The aspect ratio is the relationship between the width and height. You can preserve the aspect ratio by holding down the shift key while resizing your selection. Use the input box to specify the aspect ratio, e.g. 1:1 (square), 4:3, 16:9, etc.'); ?></p>
 
                <p><strong><?php _e('Crop Selection'); ?></strong><br />
 
                <p><strong><?php _e('Crop Selection'); ?></strong><br />
-               <?php _e('Once started, the selection can be adjusted by entering new values (in pixels). Note that these values are scaled to approximately match the original image dimensions. The minimum selection size equals the thumbnail size as set in the Media settings.'); ?></p>
+               <?php _e('Once you have made your selection, you can adjust it by entering the size in pixels. The minimum selection size is the thumbnail size as set in the Media settings.'); ?></p>
                </div>
        </div>
 
                </div>
        </div>
 
-       <p>
-               <?php _e('Aspect ratio:'); ?>
-               <span  class="nowrap">
-               <input type="text" id="imgedit-crop-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" style="width:3em;" />
-               :
-               <input type="text" id="imgedit-crop-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" style="width:3em;" />
-               </span>
-       </p>
-
-       <p id="imgedit-crop-sel-<?php echo $post_id; ?>">
-               <?php _e('Selection:'); ?>
-               <span  class="nowrap">
-               <input type="text" id="imgedit-sel-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>)" style="width:4em;" />
-               :
-               <input type="text" id="imgedit-sel-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>)" style="width:4em;" />
-               </span>
-       </p>
+       <fieldset class="imgedit-crop-ratio">
+               <legend><?php _e( 'Aspect ratio:' ); ?></legend>
+               <div class="nowrap">
+               <label><span class="screen-reader-text"><?php _e( 'crop ratio width' ); ?></span>
+               <input type="text" id="imgedit-crop-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" />
+               </label>
+               <span class="imgedit-separator">:</span>
+               <label><span class="screen-reader-text"><?php _e( 'crop ratio height' ); ?></span>
+               <input type="text" id="imgedit-crop-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" onblur="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" />
+               </label>
+               </div>
+       </fieldset>
+
+       <fieldset id="imgedit-crop-sel-<?php echo $post_id; ?>" class="imgedit-crop-sel">
+               <legend><?php _e( 'Selection:' ); ?></legend>
+               <div class="nowrap">
+               <label><span class="screen-reader-text"><?php _e( 'selection width' ); ?></span>
+               <input type="text" id="imgedit-sel-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
+               </label>
+               <span class="imgedit-separator">&times;</span>
+               <label><span class="screen-reader-text"><?php _e( 'selection height' ); ?></span>
+               <input type="text" id="imgedit-sel-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" onblur="imageEdit.setNumSelection(<?php echo $post_id; ?>, this)" />
+               </label>
+               </div>
+       </fieldset>
+
        </div>
 
        <?php if ( $thumb && $sub_sizes ) {
        </div>
 
        <?php if ( $thumb && $sub_sizes ) {
@@ -156,17 +146,19 @@ function wp_image_editor($post_id, $msg = false) {
 
        <div class="imgedit-group imgedit-applyto">
        <div class="imgedit-group-top">
 
        <div class="imgedit-group imgedit-applyto">
        <div class="imgedit-group-top">
-               <strong><?php _e('Thumbnail Settings'); ?></strong>
-               <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><?php _e('(help)'); ?></a>
-               <p class="imgedit-help"><?php _e('The thumbnail image can be cropped differently. For example it can be square or contain only a portion of the original image to showcase it better. Here you can select whether to apply changes to all image sizes or make the thumbnail different.'); ?></p>
+               <h2><?php _e( 'Thumbnail Settings' ); ?></h2>
+               <button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Thumbnail Settings Help' ); ?></span></button>
+               <p class="imgedit-help"><?php _e('You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image.'); ?></p>
        </div>
 
        </div>
 
-       <p>
-               <img src="<?php echo $thumb['url']; ?>" width="<?php echo $thumb_img[0]; ?>" height="<?php echo $thumb_img[1]; ?>" class="imgedit-size-preview" alt="" /><br /><?php _e('Current thumbnail'); ?>
-       </p>
+       <figure class="imgedit-thumbnail-preview">
+               <img src="<?php echo $thumb['url']; ?>" width="<?php echo $thumb_img[0]; ?>" height="<?php echo $thumb_img[1]; ?>" class="imgedit-size-preview" alt="" draggable="false" />
+               <figcaption class="imgedit-thumbnail-preview-caption"><?php _e( 'Current thumbnail' ); ?></figcaption>
+       </figure>
 
 
-       <p id="imgedit-save-target-<?php echo $post_id; ?>">
-               <strong><?php _e('Apply changes to:'); ?></strong><br />
+       <div id="imgedit-save-target-<?php echo $post_id; ?>" class="imgedit-save-target">
+       <fieldset>
+               <legend><strong><?php _e( 'Apply changes to:' ); ?></strong></legend>
 
                <label class="imgedit-label">
                <input type="radio" name="imgedit-target-<?php echo $post_id; ?>" value="all" checked="checked" />
 
                <label class="imgedit-label">
                <input type="radio" name="imgedit-target-<?php echo $post_id; ?>" value="all" checked="checked" />
@@ -179,100 +171,223 @@ function wp_image_editor($post_id, $msg = false) {
                <label class="imgedit-label">
                <input type="radio" name="imgedit-target-<?php echo $post_id; ?>" value="nothumb" />
                <?php _e('All sizes except thumbnail'); ?></label>
                <label class="imgedit-label">
                <input type="radio" name="imgedit-target-<?php echo $post_id; ?>" value="nothumb" />
                <?php _e('All sizes except thumbnail'); ?></label>
-       </p>
+       </fieldset>
+       </div>
        </div>
 
        <?php } ?>
 
        </div>
 
        <?php } ?>
 
-       </td></tr>
-       </tbody></table>
-       <div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
-       <script type="text/javascript">imageEdit.init(<?php echo $post_id; ?>);</script>
-       <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost.  'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
        </div>
        </div>
-<?php
-}
 
 
-function load_image_to_edit($post_id, $mime_type, $size = 'full') {
-       $filepath = get_attached_file($post_id);
+       <div class="imgedit-panel-content wp-clearfix">
+               <?php echo $note; ?>
+               <div class="imgedit-menu wp-clearfix">
+                       <button type="button" onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Crop' ); ?></span></button><?php
 
 
-       if ( $filepath && file_exists($filepath) ) {
-               if ( 'full' != $size && ( $data = image_get_intermediate_size($post_id, $size) ) )
-                       $filepath = path_join( dirname($filepath), $data['file'] );
-       } elseif ( WP_Http_Fopen::test() ) {
-               $filepath = wp_get_attachment_url($post_id);
-       }
+               // On some setups GD library does not provide imagerotate() - Ticket #11536
+               if ( wp_image_editor_supports( array( 'mime_type' => get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) {
+                       $note_no_rotate = '';
+       ?>
+                       <button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate counter-clockwise' ); ?></span></button>
+                       <button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate clockwise' ); ?></span></button>
+       <?php } else {
+                       $note_no_rotate = '<p class="note-no-rotate"><em>' . __( 'Image rotation is not supported by your web host.' ) . '</em></p>';
+       ?>
+                       <button type="button" class="imgedit-rleft button disabled" disabled></button>
+                       <button type="button" class="imgedit-rright button disabled" disabled></button>
+       <?php } ?>
 
 
-       $filepath = apply_filters('load_image_to_edit_path', $filepath, $post_id, $size);
-       if ( empty($filepath) )
-               return false;
+                       <button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><span class="screen-reader-text"><?php esc_html_e( 'Flip vertically' ); ?></span></button>
+                       <button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><span class="screen-reader-text"><?php esc_html_e( 'Flip horizontally' ); ?></span></button>
 
 
-       switch ( $mime_type ) {
-               case 'image/jpeg':
-                       $image = imagecreatefromjpeg($filepath);
-                       break;
-               case 'image/png':
-                       $image = imagecreatefrompng($filepath);
-                       break;
-               case 'image/gif':
-                       $image = imagecreatefromgif($filepath);
-                       break;
-               default:
-                       $image = false;
-                       break;
-       }
-       if ( is_resource($image) ) {
-               $image = apply_filters('load_image_to_edit', $image, $post_id, $size);
-               if ( function_exists('imagealphablending') && function_exists('imagesavealpha') ) {
-                       imagealphablending($image, false);
-                       imagesavealpha($image, true);
-               }
-       }
-       return $image;
+                       <button type="button" id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Undo' ); ?></span></button>
+                       <button type="button" id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Redo' ); ?></span></button>
+                       <?php echo $note_no_rotate; ?>
+               </div>
+
+               <input type="hidden" id="imgedit-sizer-<?php echo $post_id; ?>" value="<?php echo $sizer; ?>" />
+               <input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
+               <input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
+               <input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
+               <input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
+               <input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+
+               <div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
+               <img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" alt="" />
+               </div>
+
+               <div class="imgedit-submit">
+                       <input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button imgedit-cancel-btn" value="<?php esc_attr_e( 'Cancel' ); ?>" />
+                       <input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e( 'Save' ); ?>" />
+               </div>
+       </div>
+
+       </div>
+       <div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
+       <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
+       </div>
+<?php
 }
 
 }
 
-function wp_stream_image($image, $mime_type, $post_id) {
-       $image = apply_filters('image_save_pre', $image, $post_id);
-
-       switch ( $mime_type ) {
-               case 'image/jpeg':
-                       header('Content-Type: image/jpeg');
-                       return imagejpeg($image, null, 90);
-               case 'image/png':
-                       header('Content-Type: image/png');
-                       return imagepng($image);
-               case 'image/gif':
-                       header('Content-Type: image/gif');
-                       return imagegif($image);
-               default:
+/**
+ * Streams image in WP_Image_Editor to browser.
+ * Provided for backcompat reasons
+ *
+ * @param WP_Image_Editor $image
+ * @param string $mime_type
+ * @param int $post_id
+ * @return bool
+ */
+function wp_stream_image( $image, $mime_type, $post_id ) {
+       if ( $image instanceof WP_Image_Editor ) {
+
+               /**
+                * Filters the WP_Image_Editor instance for the image to be streamed to the browser.
+                *
+                * @since 3.5.0
+                *
+                * @param WP_Image_Editor $image   WP_Image_Editor instance.
+                * @param int             $post_id Post ID.
+                */
+               $image = apply_filters( 'image_editor_save_pre', $image, $post_id );
+
+               if ( is_wp_error( $image->stream( $mime_type ) ) )
                        return false;
                        return false;
+
+               return true;
+       } else {
+               _deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+
+               /**
+                * Filters the GD image resource to be streamed to the browser.
+                *
+                * @since 2.9.0
+                * @deprecated 3.5.0 Use image_editor_save_pre instead.
+                *
+                * @param resource $image   Image resource to be streamed.
+                * @param int      $post_id Post ID.
+                */
+               $image = apply_filters( 'image_save_pre', $image, $post_id );
+
+               switch ( $mime_type ) {
+                       case 'image/jpeg':
+                               header( 'Content-Type: image/jpeg' );
+                               return imagejpeg( $image, null, 90 );
+                       case 'image/png':
+                               header( 'Content-Type: image/png' );
+                               return imagepng( $image );
+                       case 'image/gif':
+                               header( 'Content-Type: image/gif' );
+                               return imagegif( $image );
+                       default:
+                               return false;
+               }
        }
 }
 
        }
 }
 
-function wp_save_image_file($filename, $image, $mime_type, $post_id) {
-       $image = apply_filters('image_save_pre', $image, $post_id);
-       $saved = apply_filters('wp_save_image_file', null, $filename, $image, $mime_type, $post_id);
-       if ( null !== $saved )
-               return $saved;
-
-       switch ( $mime_type ) {
-               case 'image/jpeg':
-                       return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
-               case 'image/png':
-                       return imagepng($image, $filename);
-               case 'image/gif':
-                       return imagegif($image, $filename);
-               default:
-                       return false;
+/**
+ * Saves Image to File
+ *
+ * @param string $filename
+ * @param WP_Image_Editor $image
+ * @param string $mime_type
+ * @param int $post_id
+ * @return bool
+ */
+function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
+       if ( $image instanceof WP_Image_Editor ) {
+
+               /** This filter is documented in wp-admin/includes/image-edit.php */
+               $image = apply_filters( 'image_editor_save_pre', $image, $post_id );
+
+               /**
+                * Filters whether to skip saving the image file.
+                *
+                * Returning a non-null value will short-circuit the save method,
+                * returning that value instead.
+                *
+                * @since 3.5.0
+                *
+                * @param mixed           $override  Value to return instead of saving. Default null.
+                * @param string          $filename  Name of the file to be saved.
+                * @param WP_Image_Editor $image     WP_Image_Editor instance.
+                * @param string          $mime_type Image mime type.
+                * @param int             $post_id   Post ID.
+                */
+               $saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
+
+               if ( null !== $saved )
+                       return $saved;
+
+               return $image->save( $filename, $mime_type );
+       } else {
+               _deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+
+               /** This filter is documented in wp-admin/includes/image-edit.php */
+               $image = apply_filters( 'image_save_pre', $image, $post_id );
+
+               /**
+                * Filters whether to skip saving the image file.
+                *
+                * Returning a non-null value will short-circuit the save method,
+                * returning that value instead.
+                *
+                * @since 2.9.0
+                * @deprecated 3.5.0 Use wp_save_image_editor_file instead.
+                *
+                * @param mixed           $override  Value to return instead of saving. Default null.
+                * @param string          $filename  Name of the file to be saved.
+                * @param WP_Image_Editor $image     WP_Image_Editor instance.
+                * @param string          $mime_type Image mime type.
+                * @param int             $post_id   Post ID.
+                */
+               $saved = apply_filters( 'wp_save_image_file', null, $filename, $image, $mime_type, $post_id );
+
+               if ( null !== $saved )
+                       return $saved;
+
+               switch ( $mime_type ) {
+                       case 'image/jpeg':
+
+                               /** This filter is documented in wp-includes/class-wp-image-editor.php */
+                               return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
+                       case 'image/png':
+                               return imagepng( $image, $filename );
+                       case 'image/gif':
+                               return imagegif( $image, $filename );
+                       default:
+                               return false;
+               }
        }
 }
 
        }
 }
 
+/**
+ * Image preview ratio. Internal use only.
+ *
+ * @since 2.9.0
+ *
+ * @ignore
+ * @param int $w Image width in pixels.
+ * @param int $h Image height in pixels.
+ * @return float|int Image preview ratio.
+ */
 function _image_get_preview_ratio($w, $h) {
        $max = max($w, $h);
        return $max > 400 ? (400 / $max) : 1;
 }
 
 function _image_get_preview_ratio($w, $h) {
        $max = max($w, $h);
        return $max > 400 ? (400 / $max) : 1;
 }
 
+/**
+ * Returns an image resource. Internal use only.
+ *
+ * @since 2.9.0
+ *
+ * @ignore
+ * @param resource  $img   Image resource.
+ * @param float|int $angle Image rotation angle, in degrees.
+ * @return resource|false GD image resource, false otherwise.
+ */
 function _rotate_image_resource($img, $angle) {
 function _rotate_image_resource($img, $angle) {
+       _deprecated_function( __FUNCTION__, '3.5.0', __( 'Use WP_Image_Editor::rotate' ) );
        if ( function_exists('imagerotate') ) {
                $rotated = imagerotate($img, $angle, 0);
                if ( is_resource($rotated) ) {
        if ( function_exists('imagerotate') ) {
                $rotated = imagerotate($img, $angle, 0);
                if ( is_resource($rotated) ) {
@@ -283,8 +398,19 @@ function _rotate_image_resource($img, $angle) {
        return $img;
 }
 
        return $img;
 }
 
-
+/**
+ * Flips an image resource. Internal use only.
+ *
+ * @since 2.9.0
+ *
+ * @ignore
+ * @param resource $img  Image resource.
+ * @param bool     $horz Whether to flip horizontally.
+ * @param bool     $vert Whether to flip vertically.
+ * @return resource (maybe) flipped image resource.
+ */
 function _flip_image_resource($img, $horz, $vert) {
 function _flip_image_resource($img, $horz, $vert) {
+       _deprecated_function( __FUNCTION__, '3.5.0', __( 'Use WP_Image_Editor::flip' ) );
        $w = imagesx($img);
        $h = imagesy($img);
        $dst = wp_imagecreatetruecolor($w, $h);
        $w = imagesx($img);
        $h = imagesy($img);
        $dst = wp_imagecreatetruecolor($w, $h);
@@ -302,6 +428,19 @@ function _flip_image_resource($img, $horz, $vert) {
        return $img;
 }
 
        return $img;
 }
 
+/**
+ * Crops an image resource. Internal use only.
+ *
+ * @since 2.9.0
+ *
+ * @ignore
+ * @param resource $img Image resource.
+ * @param float    $x   Source point x-coordinate.
+ * @param float    $y   Source point y-cooredinate.
+ * @param float    $w   Source width.
+ * @param float    $h   Source height.
+ * @return resource (maybe) cropped image resource.
+ */
 function _crop_image_resource($img, $x, $y, $w, $h) {
        $dst = wp_imagecreatetruecolor($w, $h);
        if ( is_resource($dst) ) {
 function _crop_image_resource($img, $x, $y, $w, $h) {
        $dst = wp_imagecreatetruecolor($w, $h);
        if ( is_resource($dst) ) {
@@ -313,12 +452,23 @@ function _crop_image_resource($img, $x, $y, $w, $h) {
        return $img;
 }
 
        return $img;
 }
 
-function image_edit_apply_changes($img, $changes) {
+/**
+ * Performs group of changes on Editor specified.
+ *
+ * @since 2.9.0
+ *
+ * @param WP_Image_Editor $image   WP_Image_Editor instance.
+ * @param array           $changes Array of change operations.
+ * @return WP_Image_Editor WP_Image_Editor instance with changes applied.
+ */
+function image_edit_apply_changes( $image, $changes ) {
+       if ( is_resource( $image ) )
+               _deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
 
        if ( !is_array($changes) )
 
        if ( !is_array($changes) )
-               return $img;
+               return $image;
 
 
-       // expand change operations
+       // Expand change operations.
        foreach ( $changes as $key => $obj ) {
                if ( isset($obj->r) ) {
                        $obj->type = 'rotate';
        foreach ( $changes as $key => $obj ) {
                if ( isset($obj->r) ) {
                        $obj->type = 'rotate';
@@ -336,10 +486,10 @@ function image_edit_apply_changes($img, $changes) {
                $changes[$key] = $obj;
        }
 
                $changes[$key] = $obj;
        }
 
-       // combine operations
+       // Combine operations.
        if ( count($changes) > 1 ) {
                $filtered = array($changes[0]);
        if ( count($changes) > 1 ) {
                $filtered = array($changes[0]);
-               for ( $i = 0, $j = 1; $j < count($changes); $j++ ) {
+               for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) {
                        $combined = false;
                        if ( $filtered[$i]->type == $changes[$j]->type ) {
                                switch ( $filtered[$i]->type ) {
                        $combined = false;
                        if ( $filtered[$i]->type == $changes[$j]->type ) {
                                switch ( $filtered[$i]->type ) {
@@ -360,64 +510,122 @@ function image_edit_apply_changes($img, $changes) {
                unset($filtered);
        }
 
                unset($filtered);
        }
 
-       // image resource before applying the changes
-       $img = apply_filters('image_edit_before_change', $img, $changes);
+       // Image resource before applying the changes.
+       if ( $image instanceof WP_Image_Editor ) {
+
+               /**
+                * Filters the WP_Image_Editor instance before applying changes to the image.
+                *
+                * @since 3.5.0
+                *
+                * @param WP_Image_Editor $image   WP_Image_Editor instance.
+                * @param array           $changes Array of change operations.
+                */
+               $image = apply_filters( 'wp_image_editor_before_change', $image, $changes );
+       } elseif ( is_resource( $image ) ) {
+
+               /**
+                * Filters the GD image resource before applying changes to the image.
+                *
+                * @since 2.9.0
+                * @deprecated 3.5.0 Use wp_image_editor_before_change instead.
+                *
+                * @param resource $image   GD image resource.
+                * @param array    $changes Array of change operations.
+                */
+               $image = apply_filters( 'image_edit_before_change', $image, $changes );
+       }
 
        foreach ( $changes as $operation ) {
                switch ( $operation->type ) {
                        case 'rotate':
 
        foreach ( $changes as $operation ) {
                switch ( $operation->type ) {
                        case 'rotate':
-                               if ( $operation->angle != 0 )
-                                       $img = _rotate_image_resource($img, $operation->angle);
+                               if ( $operation->angle != 0 ) {
+                                       if ( $image instanceof WP_Image_Editor )
+                                               $image->rotate( $operation->angle );
+                                       else
+                                               $image = _rotate_image_resource( $image, $operation->angle );
+                               }
                                break;
                        case 'flip':
                                if ( $operation->axis != 0 )
                                break;
                        case 'flip':
                                if ( $operation->axis != 0 )
-                                       $img = _flip_image_resource($img, ($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
+                                       if ( $image instanceof WP_Image_Editor )
+                                               $image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
+                                       else
+                                               $image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
                                break;
                        case 'crop':
                                $sel = $operation->sel;
                                break;
                        case 'crop':
                                $sel = $operation->sel;
-                               $scale = 1 / _image_get_preview_ratio( imagesx($img), imagesy($img) ); // discard preview scaling
-                               $img = _crop_image_resource($img, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
+
+                               if ( $image instanceof WP_Image_Editor ) {
+                                       $size = $image->get_size();
+                                       $w = $size['width'];
+                                       $h = $size['height'];
+
+                                       $scale = 1 / _image_get_preview_ratio( $w, $h ); // discard preview scaling
+                                       $image->crop( $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+                               } else {
+                                       $scale = 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // discard preview scaling
+                                       $image = _crop_image_resource( $image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+                               }
                                break;
                }
        }
 
                                break;
                }
        }
 
-       return $img;
+       return $image;
 }
 
 }
 
-function stream_preview_image($post_id) {
-       $post = get_post($post_id);
-       @ini_set('memory_limit', '256M');
-       $img = load_image_to_edit( $post_id, $post->post_mime_type, array(400, 400) );
 
 
-       if ( !is_resource($img) )
+/**
+ * Streams image in post to browser, along with enqueued changes
+ * in $_REQUEST['history']
+ *
+ * @param int $post_id
+ * @return bool
+ */
+function stream_preview_image( $post_id ) {
+       $post = get_post( $post_id );
+
+       wp_raise_memory_limit( 'admin' );
+
+       $img = wp_get_image_editor( _load_image_to_edit_path( $post_id ) );
+
+       if ( is_wp_error( $img ) ) {
                return false;
                return false;
+       }
 
 
-       $changes = !empty($_REQUEST['history']) ? json_decode( stripslashes($_REQUEST['history']) ) : null;
+       $changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null;
        if ( $changes )
        if ( $changes )
-               $img = image_edit_apply_changes($img, $changes);
+               $img = image_edit_apply_changes( $img, $changes );
 
 
-       // scale the image
-       $w = imagesx($img);
-       $h = imagesy($img);
-       $ratio = _image_get_preview_ratio($w, $h);
-       $w2 = $w * $ratio;
-       $h2 = $h * $ratio;
+       // Scale the image.
+       $size = $img->get_size();
+       $w = $size['width'];
+       $h = $size['height'];
 
 
-       $preview = wp_imagecreatetruecolor($w2, $h2);
-       imagecopyresampled( $preview, $img, 0, 0, 0, 0, $w2, $h2, $w, $h );
-       wp_stream_image($preview, $post->post_mime_type, $post_id);
+       $ratio = _image_get_preview_ratio( $w, $h );
+       $w2 = max ( 1, $w * $ratio );
+       $h2 = max ( 1, $h * $ratio );
 
 
-       imagedestroy($preview);
-       imagedestroy($img);
-       return true;
+       if ( is_wp_error( $img->resize( $w2, $h2 ) ) )
+               return false;
+
+       return wp_stream_image( $img, $post->post_mime_type, $post_id );
 }
 
 }
 
+/**
+ * Restores the metadata for a given attachment.
+ *
+ * @since 2.9.0
+ *
+ * @param int $post_id Attachment post ID.
+ * @return stdClass Image restoration message object.
+ */
 function wp_restore_image($post_id) {
        $meta = wp_get_attachment_metadata($post_id);
        $file = get_attached_file($post_id);
 function wp_restore_image($post_id) {
        $meta = wp_get_attachment_metadata($post_id);
        $file = get_attached_file($post_id);
-       $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+       $backup_sizes = $old_backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
        $restored = false;
        $restored = false;
-       $msg = '';
+       $msg = new stdClass;
 
        if ( !is_array($backup_sizes) ) {
                $msg->error = __('Cannot load image metadata.');
 
        if ( !is_array($backup_sizes) ) {
                $msg->error = __('Cannot load image metadata.');
@@ -426,19 +634,19 @@ function wp_restore_image($post_id) {
 
        $parts = pathinfo($file);
        $suffix = time() . rand(100, 999);
 
        $parts = pathinfo($file);
        $suffix = time() . rand(100, 999);
-       $default_sizes = apply_filters( 'intermediate_image_sizes', array('large', 'medium', 'thumbnail') );
+       $default_sizes = get_intermediate_image_sizes();
 
        if ( isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig']) ) {
                $data = $backup_sizes['full-orig'];
 
                if ( $parts['basename'] != $data['file'] ) {
                        if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
 
        if ( isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig']) ) {
                $data = $backup_sizes['full-orig'];
 
                if ( $parts['basename'] != $data['file'] ) {
                        if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
-                               // delete only if it's edited image
+
+                               // Delete only if it's an edited image.
                                if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
                                if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
-                                       $delpath = apply_filters('wp_delete_file', $file);
-                                       @unlink($delpath);
+                                       wp_delete_file( $file );
                                }
                                }
-                       } else {
+                       } elseif ( isset( $meta['width'], $meta['height'] ) ) {
                                $backup_sizes["full-$suffix"] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $parts['basename']);
                        }
                }
                                $backup_sizes["full-$suffix"] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $parts['basename']);
                        }
                }
@@ -449,8 +657,6 @@ function wp_restore_image($post_id) {
                $meta['file'] = _wp_relative_upload_path( $restored_file );
                $meta['width'] = $data['width'];
                $meta['height'] = $data['height'];
                $meta['file'] = _wp_relative_upload_path( $restored_file );
                $meta['width'] = $data['width'];
                $meta['height'] = $data['height'];
-               list ( $uwidth, $uheight ) = wp_shrink_dimensions($meta['width'], $meta['height']);
-               $meta['hwstring_small'] = "height='$uheight' width='$uwidth'";
        }
 
        foreach ( $default_sizes as $default_size ) {
        }
 
        foreach ( $default_sizes as $default_size ) {
@@ -458,10 +664,11 @@ function wp_restore_image($post_id) {
                        $data = $backup_sizes["$default_size-orig"];
                        if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) {
                                if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
                        $data = $backup_sizes["$default_size-orig"];
                        if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) {
                                if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
-                                       // delete only if it's edited image
+
+                                       // Delete only if it's an edited image.
                                        if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
                                        if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
-                                               $delpath = apply_filters( 'wp_delete_file', path_join($parts['dirname'], $meta['sizes'][$default_size]['file']) );
-                                               @unlink($delpath);
+                                               $delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] );
+                                               wp_delete_file( $delete_file );
                                        }
                                } else {
                                        $backup_sizes["$default_size-{$suffix}"] = $meta['sizes'][$default_size];
                                        }
                                } else {
                                        $backup_sizes["$default_size-{$suffix}"] = $meta['sizes'][$default_size];
@@ -474,7 +681,9 @@ function wp_restore_image($post_id) {
                }
        }
 
                }
        }
 
-       if ( !wp_update_attachment_metadata($post_id, $meta) || !update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes) ) {
+       if ( ! wp_update_attachment_metadata( $post_id, $meta ) ||
+               ( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) {
+
                $msg->error = __('Cannot save image metadata.');
                return $msg;
        }
                $msg->error = __('Cannot save image metadata.');
                return $msg;
        }
@@ -487,14 +696,24 @@ function wp_restore_image($post_id) {
        return $msg;
 }
 
        return $msg;
 }
 
-function wp_save_image($post_id) {
-       $return = '';
+/**
+ * Saves image to post along with enqueued changes
+ * in $_REQUEST['history']
+ *
+ * @global array $_wp_additional_image_sizes
+ *
+ * @param int $post_id
+ * @return \stdClass
+ */
+function wp_save_image( $post_id ) {
+       global $_wp_additional_image_sizes;
+
+       $return = new stdClass;
        $success = $delete = $scaled = $nocrop = false;
        $success = $delete = $scaled = $nocrop = false;
-       $post = get_post($post_id);
-       @ini_set('memory_limit', '256M');
-       $img = load_image_to_edit($post_id, $post->post_mime_type);
+       $post = get_post( $post_id );
 
 
-       if ( !is_resource($img) ) {
+       $img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
+       if ( is_wp_error( $img ) ) {
                $return->error = esc_js( __('Unable to create new image.') );
                return $return;
        }
                $return->error = esc_js( __('Unable to create new image.') );
                return $return;
        }
@@ -505,19 +724,16 @@ function wp_save_image($post_id) {
        $scale = !empty($_REQUEST['do']) && 'scale' == $_REQUEST['do'];
 
        if ( $scale && $fwidth > 0 && $fheight > 0 ) {
        $scale = !empty($_REQUEST['do']) && 'scale' == $_REQUEST['do'];
 
        if ( $scale && $fwidth > 0 && $fheight > 0 ) {
-               $sX = imagesx($img);
-               $sY = imagesy($img);
+               $size = $img->get_size();
+               $sX = $size['width'];
+               $sY = $size['height'];
 
 
-               // check if it has roughly the same w / h ratio
+               // Check if it has roughly the same w / h ratio.
                $diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
                if ( -0.1 < $diff && $diff < 0.1 ) {
                $diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
                if ( -0.1 < $diff && $diff < 0.1 ) {
-                       // scale the full size image
-                       $dst = wp_imagecreatetruecolor($fwidth, $fheight);
-                       if ( imagecopyresampled( $dst, $img, 0, 0, 0, 0, $fwidth, $fheight, $sX, $sY ) ) {
-                               imagedestroy($img);
-                               $img = $dst;
+                       // Scale the full size image.
+                       if ( $img->resize( $fwidth, $fheight ) )
                                $scaled = true;
                                $scaled = true;
-                       }
                }
 
                if ( !$scaled ) {
                }
 
                if ( !$scaled ) {
@@ -525,7 +741,7 @@ function wp_save_image($post_id) {
                        return $return;
                }
        } elseif ( !empty($_REQUEST['history']) ) {
                        return $return;
                }
        } elseif ( !empty($_REQUEST['history']) ) {
-               $changes = json_decode( stripslashes($_REQUEST['history']) );
+               $changes = json_decode( wp_unslash($_REQUEST['history']) );
                if ( $changes )
                        $img = image_edit_apply_changes($img, $changes);
        } else {
                if ( $changes )
                        $img = image_edit_apply_changes($img, $changes);
        } else {
@@ -544,9 +760,9 @@ function wp_save_image($post_id) {
        if ( !is_array($backup_sizes) )
                $backup_sizes = array();
 
        if ( !is_array($backup_sizes) )
                $backup_sizes = array();
 
-       // generate new filename
+       // Generate new filename.
        $path = get_attached_file($post_id);
        $path = get_attached_file($post_id);
-       $path_parts = pathinfo52( $path );
+       $path_parts = pathinfo( $path );
        $filename = $path_parts['filename'];
        $suffix = time() . rand(100, 999);
 
        $filename = $path_parts['filename'];
        $suffix = time() . rand(100, 999);
 
@@ -570,7 +786,7 @@ function wp_save_image($post_id) {
                }
        }
 
                }
        }
 
-       // save the full-size file, also needed to create sub-sizes
+       // Save the full-size file, also needed to create sub-sizes.
        if ( !wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id) ) {
                $return->error = esc_js( __('Unable to save the image.') );
                return $return;
        if ( !wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id) ) {
                $return->error = esc_js( __('Unable to save the image.') );
                return $return;
@@ -588,17 +804,16 @@ function wp_save_image($post_id) {
                if ( $tag )
                        $backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
 
                if ( $tag )
                        $backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
 
-               $success = update_attached_file($post_id, $new_path);
+               $success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
 
 
-               $meta['file'] = _wp_relative_upload_path($new_path);
-               $meta['width'] = imagesx($img);
-               $meta['height'] = imagesy($img);
+               $meta['file'] = _wp_relative_upload_path( $new_path );
 
 
-               list ( $uwidth, $uheight ) = wp_shrink_dimensions($meta['width'], $meta['height']);
-               $meta['hwstring_small'] = "height='$uheight' width='$uwidth'";
+               $size = $img->get_size();
+               $meta['width'] = $size['width'];
+               $meta['height'] = $size['height'];
 
                if ( $success && ('nothumb' == $target || 'all' == $target) ) {
 
                if ( $success && ('nothumb' == $target || 'all' == $target) ) {
-                       $sizes = apply_filters( 'intermediate_image_sizes', array('large', 'medium', 'thumbnail') );
+                       $sizes = get_intermediate_image_sizes();
                        if ( 'nothumb' == $target )
                                $sizes = array_diff( $sizes, array('thumbnail') );
                }
                        if ( 'nothumb' == $target )
                                $sizes = array_diff( $sizes, array('thumbnail') );
                }
@@ -610,10 +825,27 @@ function wp_save_image($post_id) {
                $success = $delete = $nocrop = true;
        }
 
                $success = $delete = $nocrop = true;
        }
 
-       if ( isset($sizes) ) {
+       /*
+        * We need to remove any existing resized image files because
+        * a new crop or rotate could generate different sizes (and hence, filenames),
+        * keeping the new resized images from overwriting the existing image files.
+        * https://core.trac.wordpress.org/ticket/32171
+        */
+       if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE && ! empty( $meta['sizes'] ) ) {
+               foreach ( $meta['sizes'] as $size ) {
+                       if ( ! empty( $size['file'] ) && preg_match( '/-e[0-9]{13}-/', $size['file'] ) ) {
+                               $delete_file = path_join( $path_parts['dirname'], $size['file'] );
+                               wp_delete_file( $delete_file );
+                       }
+               }
+       }
+
+       if ( isset( $sizes ) ) {
+               $_sizes = array();
+
                foreach ( $sizes as $size ) {
                        $tag = false;
                foreach ( $sizes as $size ) {
                        $tag = false;
-                       if ( isset($meta['sizes'][$size]) ) {
+                       if ( isset( $meta['sizes'][$size] ) ) {
                                if ( isset($backup_sizes["$size-orig"]) ) {
                                        if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
                                                $tag = "$size-$suffix";
                                if ( isset($backup_sizes["$size-orig"]) ) {
                                        if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
                                                $tag = "$size-$suffix";
@@ -625,39 +857,50 @@ function wp_save_image($post_id) {
                                        $backup_sizes[$tag] = $meta['sizes'][$size];
                        }
 
                                        $backup_sizes[$tag] = $meta['sizes'][$size];
                        }
 
-                       $crop = $nocrop ? false : get_option("{$size}_crop");
-                       $resized = image_make_intermediate_size($new_path, get_option("{$size}_size_w"), get_option("{$size}_size_h"), $crop );
+                       if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {
+                               $width  = intval( $_wp_additional_image_sizes[ $size ]['width'] );
+                               $height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
+                               $crop   = ( $nocrop ) ? false : $_wp_additional_image_sizes[ $size ]['crop'];
+                       } else {
+                               $height = get_option( "{$size}_size_h" );
+                               $width  = get_option( "{$size}_size_w" );
+                               $crop   = ( $nocrop ) ? false : get_option( "{$size}_crop" );
+                       }
 
 
-                       if ( $resized )
-                               $meta['sizes'][$size] = $resized;
-                       else
-                               unset($meta['sizes'][$size]);
+                       $_sizes[ $size ] = array( 'width' => $width, 'height' => $height, 'crop' => $crop );
                }
                }
+
+               $meta['sizes'] = array_merge( $meta['sizes'], $img->multi_resize( $_sizes ) );
        }
 
        }
 
+       unset( $img );
+
        if ( $success ) {
        if ( $success ) {
-               wp_update_attachment_metadata($post_id, $meta);
+               wp_update_attachment_metadata( $post_id, $meta );
                update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes);
 
                if ( $target == 'thumbnail' || $target == 'all' || $target == 'full' ) {
                update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes);
 
                if ( $target == 'thumbnail' || $target == 'all' || $target == 'full' ) {
-                       $file_url = wp_get_attachment_url($post_id);
-                       if ( $thumb = $meta['sizes']['thumbnail'] )
-                               $return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
-                       else
-                               $return->thumbnail = "$file_url?w=128&h=128";
+                       // Check if it's an image edit from attachment edit screen
+                       if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' == $_REQUEST['context'] ) {
+                               $thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+                               $return->thumbnail = $thumb_url[0];
+                       } else {
+                               $file_url = wp_get_attachment_url($post_id);
+                               if ( ! empty( $meta['sizes']['thumbnail'] ) && $thumb = $meta['sizes']['thumbnail'] ) {
+                                       $return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
+                               } else {
+                                       $return->thumbnail = "$file_url?w=128&h=128";
+                               }
+                       }
                }
        } else {
                $delete = true;
        }
 
        if ( $delete ) {
                }
        } else {
                $delete = true;
        }
 
        if ( $delete ) {
-               $delpath = apply_filters('wp_delete_file', $new_path);
-               @unlink($delpath);
+               wp_delete_file( $new_path );
        }
 
        }
 
-       imagedestroy($img);
-
        $return->msg = esc_js( __('Image saved') );
        return $return;
 }
        $return->msg = esc_js( __('Image saved') );
        return $return;
 }
-