--- a/wp/wp-admin/includes/image-edit.php Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-admin/includes/image-edit.php Tue Dec 15 13:49:49 2020 +0100
@@ -11,7 +11,7 @@
*
* @since 2.9.0
*
- * @param int $post_id Post ID.
+ * @param int $post_id Attachment post ID.
* @param bool|object $msg Optional. Message to display for image editor updates or errors.
* Default false.
*/
@@ -33,14 +33,14 @@
$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
$can_restore = false;
if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) {
- $can_restore = $backup_sizes['full-orig']['file'] != wp_basename( $meta['file'] );
+ $can_restore = wp_basename( $meta['file'] ) !== $backup_sizes['full-orig']['file'];
}
if ( $msg ) {
if ( isset( $msg->error ) ) {
- $note = "<div class='error'><p>$msg->error</p></div>";
+ $note = "<div class='notice notice-error' tabindex='-1' role='alert'><p>$msg->error</p></div>";
} elseif ( isset( $msg->msg ) ) {
- $note = "<div class='updated'><p>$msg->msg</p></div>";
+ $note = "<div class='notice notice-success' tabindex='-1' role='alert'><p>$msg->msg</p></div>";
}
}
@@ -48,177 +48,37 @@
<div class="imgedit-wrap wp-clearfix">
<div id="imgedit-panel-<?php echo $post_id; ?>">
- <div class="imgedit-settings">
- <div class="imgedit-group">
- <div class="imgedit-group-top">
- <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">
- <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>
- <?php if ( isset( $meta['width'], $meta['height'] ) ) : ?>
- <p><?php printf( __( 'Original dimensions %s' ), $meta['width'] . ' × ' . $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">×</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>
-
- <?php if ( $can_restore ) { ?>
-
- <div class="imgedit-group">
- <div class="imgedit-group-top">
- <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">
- <p>
- <?php
- _e( 'Discard any changes and restore the original image.' );
-
- if ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) {
- echo ' ' . __( 'Previously edited copies of the image will not be deleted.' );
- }
-
- ?>
- </p>
- <div class="imgedit-submit">
- <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>
-
- <?php } ?>
-
- <div class="imgedit-group">
- <div class="imgedit-group-top">
- <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">
- <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 />
- <?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 />
- <?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>
-
- <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">×</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 ) {
- $thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
- ?>
-
- <div class="imgedit-group imgedit-applyto">
- <div class="imgedit-group-top">
- <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>
-
- <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>
-
- <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" />
- <?php _e( 'All image sizes' ); ?></label>
-
- <label class="imgedit-label">
- <input type="radio" name="imgedit-target-<?php echo $post_id; ?>" value="thumbnail" />
- <?php _e( '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>
- </fieldset>
- </div>
- </div>
-
- <?php } ?>
-
- </div>
-
<div class="imgedit-panel-content wp-clearfix">
<?php echo $note; ?>
<div class="imgedit-menu wp-clearfix">
- <button type="button" onclick="imageEdit.handleCropToolClick( <?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
+ <button type="button" onclick="imageEdit.handleCropToolClick( <?php echo "$post_id, '$nonce'"; ?>, this )" class="imgedit-crop button disabled" disabled><?php esc_html_e( 'Crop' ); ?></button>
+ <?php
- // 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 } ?>
+ // 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)"><?php esc_html_e( 'Rotate left' ); ?></button>
+ <button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><?php esc_html_e( 'Rotate right' ); ?></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 } ?>
- <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>
+ <button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><?php esc_html_e( 'Flip vertical' ); ?></button>
+ <button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><?php esc_html_e( 'Flip horizontal' ); ?></button>
- <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>
+ <br class="imgedit-undo-redo-separator" />
+ <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><?php esc_html_e( 'Undo' ); ?></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><?php esc_html_e( 'Redo' ); ?></button>
<?php echo $note_no_rotate; ?>
</div>
@@ -239,6 +99,153 @@
</div>
</div>
+ <div class="imgedit-settings">
+ <div class="imgedit-group">
+ <div class="imgedit-group-top">
+ <h2><?php _e( 'Scale Image' ); ?></h2>
+ <button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Scale Image Help' ); ?></span></button>
+ <div class="imgedit-help">
+ <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>
+ <?php if ( isset( $meta['width'], $meta['height'] ) ) : ?>
+ <p>
+ <?php
+ printf(
+ /* translators: %s: Image width and height in pixels. */
+ __( 'Original dimensions %s' ),
+ '<span class="imgedit-original-dimensions">' . $meta['width'] . ' × ' . $meta['height'] . '</span>'
+ );
+ ?>
+ </p>
+ <?php endif ?>
+ <div class="imgedit-submit">
+
+ <fieldset class="imgedit-scale">
+ <legend><?php _e( 'New dimensions:' ); ?></legend>
+ <div class="nowrap">
+ <label for="imgedit-scale-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale width' ); ?></label>
+ <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; ?>" />
+ <span class="imgedit-separator" aria-hidden="true">×</span>
+ <label for="imgedit-scale-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'scale height' ); ?></label>
+ <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; ?>" />
+ <span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
+ <div class="imgedit-scale-button-wrapper"><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>
+ </div>
+ </fieldset>
+
+ </div>
+ </div>
+ </div>
+
+ <?php if ( $can_restore ) { ?>
+
+ <div class="imgedit-group">
+ <div class="imgedit-group-top">
+ <h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link" aria-expanded="false"><?php _e( 'Restore original image' ); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
+ <div class="imgedit-help imgedit-restore">
+ <p>
+ <?php
+ _e( 'Discard any changes and restore the original image.' );
+
+ if ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) {
+ echo ' ' . __( 'Previously edited copies of the image will not be deleted.' );
+ }
+ ?>
+ </p>
+ <div class="imgedit-submit">
+ <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>
+
+ <?php } ?>
+
+ <div class="imgedit-group">
+ <div class="imgedit-group-top">
+ <h2><?php _e( 'Image Crop' ); ?></h2>
+ <button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Image Crop Help' ); ?></span></button>
+
+ <div class="imgedit-help">
+ <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 />
+ <?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 />
+ <?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>
+
+ <fieldset class="imgedit-crop-ratio">
+ <legend><?php _e( 'Aspect ratio:' ); ?></legend>
+ <div class="nowrap">
+ <label for="imgedit-crop-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'crop ratio width' ); ?></label>
+ <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)" />
+ <span class="imgedit-separator" aria-hidden="true">:</span>
+ <label for="imgedit-crop-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'crop ratio height' ); ?></label>
+ <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)" />
+ </div>
+ </fieldset>
+
+ <fieldset id="imgedit-crop-sel-<?php echo $post_id; ?>" class="imgedit-crop-sel">
+ <legend><?php _e( 'Selection:' ); ?></legend>
+ <div class="nowrap">
+ <label for="imgedit-sel-width-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'selection width' ); ?></label>
+ <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)" />
+ <span class="imgedit-separator" aria-hidden="true">×</span>
+ <label for="imgedit-sel-height-<?php echo $post_id; ?>" class="screen-reader-text"><?php _e( 'selection height' ); ?></label>
+ <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)" />
+ </div>
+ </fieldset>
+
+ </div>
+
+ <?php
+ if ( $thumb && $sub_sizes ) {
+ $thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
+ ?>
+
+ <div class="imgedit-group imgedit-applyto">
+ <div class="imgedit-group-top">
+ <h2><?php _e( 'Thumbnail Settings' ); ?></h2>
+ <button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Thumbnail Settings Help' ); ?></span></button>
+ <div class="imgedit-help">
+ <p><?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>
+
+ <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>
+
+ <div id="imgedit-save-target-<?php echo $post_id; ?>" class="imgedit-save-target">
+ <fieldset>
+ <legend><?php _e( 'Apply changes to:' ); ?></legend>
+
+ <span class="imgedit-label">
+ <input type="radio" id="imgedit-target-all" name="imgedit-target-<?php echo $post_id; ?>" value="all" checked="checked" />
+ <label for="imgedit-target-all"><?php _e( 'All image sizes' ); ?></label>
+ </span>
+
+ <span class="imgedit-label">
+ <input type="radio" id="imgedit-target-thumbnail" name="imgedit-target-<?php echo $post_id; ?>" value="thumbnail" />
+ <label for="imgedit-target-thumbnail"><?php _e( 'Thumbnail' ); ?></label>
+ </span>
+
+ <span class="imgedit-label">
+ <input type="radio" id="imgedit-target-nothumb" name="imgedit-target-<?php echo $post_id; ?>" value="nothumb" />
+ <label for="imgedit-target-nothumb"><?php _e( 'All sizes except thumbnail' ); ?></label>
+ </span>
+ </fieldset>
+ </div>
+ </div>
+
+ <?php } ?>
+
+ </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>
@@ -275,18 +282,19 @@
return true;
} else {
- _deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+ /* translators: 1: $image, 2: WP_Image_Editor */
+ _deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( '%1$s needs to be a %2$s object.' ), '$image', 'WP_Image_Editor' ) );
/**
* 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.
+ * @deprecated 3.5.0 Use {@see 'image_editor_save_pre'} instead.
*
* @param resource $image Image resource to be streamed.
* @param int $attachment_id The attachment post ID.
*/
- $image = apply_filters( 'image_save_pre', $image, $attachment_id );
+ $image = apply_filters_deprecated( 'image_save_pre', array( $image, $attachment_id ), '3.5.0', 'image_editor_save_pre' );
switch ( $mime_type ) {
case 'image/jpeg':
@@ -309,11 +317,11 @@
*
* @since 2.9.0
*
- * @param string $filename
- * @param WP_Image_Editor $image
- * @param string $mime_type
- * @param int $post_id
- * @return bool
+ * @param string $filename Name of the file to be saved.
+ * @param WP_Image_Editor $image The image editor instance.
+ * @param string $mime_type The mime type of the image.
+ * @param int $post_id Attachment post ID.
+ * @return bool True on success, false on failure.
*/
function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
if ( $image instanceof WP_Image_Editor ) {
@@ -329,11 +337,11 @@
*
* @since 3.5.0
*
- * @param mixed $override Value to return instead of saving. Default null.
+ * @param bool|null $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.
+ * @param WP_Image_Editor $image The image editor instance.
+ * @param string $mime_type The mime type of the image.
+ * @param int $post_id Attachment post ID.
*/
$saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
@@ -343,10 +351,11 @@
return $image->save( $filename, $mime_type );
} else {
- _deprecated_argument( __FUNCTION__, '3.5.0', __( '$image needs to be an WP_Image_Editor object' ) );
+ /* translators: 1: $image, 2: WP_Image_Editor */
+ _deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( '%1$s needs to be a %2$s object.' ), '$image', 'WP_Image_Editor' ) );
/** This filter is documented in wp-admin/includes/image-edit.php */
- $image = apply_filters( 'image_save_pre', $image, $post_id );
+ $image = apply_filters_deprecated( 'image_save_pre', array( $image, $post_id ), '3.5.0', 'image_editor_save_pre' );
/**
* Filters whether to skip saving the image file.
@@ -355,15 +364,20 @@
* returning that value instead.
*
* @since 2.9.0
- * @deprecated 3.5.0 Use wp_save_image_editor_file instead.
+ * @deprecated 3.5.0 Use {@see '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.
+ * @param WP_Image_Editor $image The image editor instance.
+ * @param string $mime_type The mime type of the image.
+ * @param int $post_id Attachment post ID.
*/
- $saved = apply_filters( 'wp_save_image_file', null, $filename, $image, $mime_type, $post_id );
+ $saved = apply_filters_deprecated(
+ 'wp_save_image_file',
+ array( null, $filename, $image, $mime_type, $post_id ),
+ '3.5.0',
+ 'wp_save_image_editor_file'
+ );
if ( null !== $saved ) {
return $saved;
@@ -462,7 +476,7 @@
* @ignore
* @param resource $img Image resource.
* @param float $x Source point x-coordinate.
- * @param float $y Source point y-cooredinate.
+ * @param float $y Source point y-coordinate.
* @param float $w Source width.
* @param float $h Source height.
* @return resource (maybe) cropped image resource.
@@ -489,7 +503,8 @@
*/
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' ) );
+ /* translators: 1: $image, 2: WP_Image_Editor */
+ _deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( '%1$s needs to be a %2$s object.' ), '$image', 'WP_Image_Editor' ) );
}
if ( ! is_array( $changes ) ) {
@@ -557,18 +572,18 @@
* 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.
+ * @deprecated 3.5.0 Use {@see '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 );
+ $image = apply_filters_deprecated( 'image_edit_before_change', array( $image, $changes ), '3.5.0', 'wp_image_editor_before_change' );
}
foreach ( $changes as $operation ) {
switch ( $operation->type ) {
case 'rotate':
- if ( $operation->angle != 0 ) {
+ if ( 0 != $operation->angle ) {
if ( $image instanceof WP_Image_Editor ) {
$image->rotate( $operation->angle );
} else {
@@ -577,7 +592,7 @@
}
break;
case 'flip':
- if ( $operation->axis != 0 ) {
+ if ( 0 != $operation->axis ) {
if ( $image instanceof WP_Image_Editor ) {
$image->flip( ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
} else {
@@ -593,10 +608,10 @@
$w = $size['width'];
$h = $size['height'];
- $scale = 1 / _image_get_preview_ratio( $w, $h ); // discard preview scaling
+ $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
+ $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;
@@ -609,12 +624,12 @@
/**
* Streams image in post to browser, along with enqueued changes
- * in $_REQUEST['history']
+ * in `$_REQUEST['history']`.
*
* @since 2.9.0
*
- * @param int $post_id
- * @return bool
+ * @param int $post_id Attachment post ID.
+ * @return bool True on success, false on failure.
*/
function stream_preview_image( $post_id ) {
$post = get_post( $post_id );
@@ -657,11 +672,12 @@
* @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 );
- $backup_sizes = $old_backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
- $restored = false;
- $msg = new stdClass;
+ $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 );
+ $old_backup_sizes = $backup_sizes;
+ $restored = false;
+ $msg = new stdClass;
if ( ! is_array( $backup_sizes ) ) {
$msg->error = __( 'Cannot load image metadata.' );
@@ -738,19 +754,22 @@
}
/**
- * Saves image to post along with enqueued changes
- * in $_REQUEST['history']
+ * Saves image to post, along with enqueued changes
+ * in `$_REQUEST['history']`.
*
* @since 2.9.0
*
- * @param int $post_id
- * @return \stdClass
+ * @param int $post_id Attachment post ID.
+ * @return stdClass
*/
function wp_save_image( $post_id ) {
$_wp_additional_image_sizes = wp_get_additional_image_sizes();
$return = new stdClass;
- $success = $delete = $scaled = $nocrop = false;
+ $success = false;
+ $delete = false;
+ $scaled = false;
+ $nocrop = false;
$post = get_post( $post_id );
$img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
@@ -762,7 +781,7 @@
$fwidth = ! empty( $_REQUEST['fwidth'] ) ? intval( $_REQUEST['fwidth'] ) : 0;
$fheight = ! empty( $_REQUEST['fheight'] ) ? intval( $_REQUEST['fheight'] ) : 0;
$target = ! empty( $_REQUEST['target'] ) ? preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['target'] ) : '';
- $scale = ! empty( $_REQUEST['do'] ) && 'scale' == $_REQUEST['do'];
+ $scale = ! empty( $_REQUEST['do'] ) && 'scale' === $_REQUEST['do'];
if ( $scale && $fwidth > 0 && $fheight > 0 ) {
$size = $img->get_size();
@@ -816,7 +835,7 @@
if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE &&
isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] != $basename ) {
- if ( 'thumbnail' == $target ) {
+ if ( 'thumbnail' === $target ) {
$new_path = "{$dirname}/{$filename}-temp.{$ext}";
} else {
$new_path = $path;
@@ -866,18 +885,20 @@
$meta['width'] = $size['width'];
$meta['height'] = $size['height'];
- if ( $success && ( 'nothumb' == $target || 'all' == $target ) ) {
+ if ( $success && ( 'nothumb' === $target || 'all' === $target ) ) {
$sizes = get_intermediate_image_sizes();
- if ( 'nothumb' == $target ) {
+ if ( 'nothumb' === $target ) {
$sizes = array_diff( $sizes, array( 'thumbnail' ) );
}
}
$return->fw = $meta['width'];
$return->fh = $meta['height'];
- } elseif ( 'thumbnail' == $target ) {
+ } elseif ( 'thumbnail' === $target ) {
$sizes = array( 'thumbnail' );
- $success = $delete = $nocrop = true;
+ $success = true;
+ $delete = true;
+ $nocrop = true;
}
/*
@@ -940,14 +961,15 @@
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' ) {
- // Check if it's an image edit from attachment edit screen
- if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' == $_REQUEST['context'] ) {
+ if ( 'thumbnail' === $target || 'all' === $target || 'full' === $target ) {
+ // 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'] ) {
+ 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";