enmi-conf.org: comparison wp/wp-admin/includes/image-edit.php

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 /**
 * Loads the WP image-editing interface.
 *
 * @since 2.9.0
 *
-* @param int         $post_id Attachment post ID.
+* @param int          $post_id Attachment post ID.
-* @param bool|object $msg     Optional. Message to display for image editor updates or errors.
+* @param false|object $msg     Optional. Message to display for image editor updates or errors.
-*                             Default false.
+*                              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 );
 	$thumb     = image_get_intermediate_size( $post_id, 'thumbnail' );
 		<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="" />
+		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')"
+			src="<?php echo esc_url( admin_url( 'admin-ajax.php', 'relative' ) ) . '?action=imgedit-preview&amp;_ajax_nonce=' . $nonce . '&amp;postid=' . $post_id . '&amp;rand=' . 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' ); ?>" />
 				__( 'Original dimensions %s' ),
 				'<span class="imgedit-original-dimensions">' . $meta['width'] . ' &times; ' . $meta['height'] . '</span>'
 			);
 			?>
 		</p>
-		<?php endif ?>
+		<?php endif; ?>
 		<div class="imgedit-submit">
 		<fieldset class="imgedit-scale">
 		<legend><?php _e( 'New dimensions:' ); ?></legend>
 		<div class="nowrap">
 		 * Filters the GD image resource to be streamed to the browser.
 		 *
 		 * @since 2.9.0
 		 * @deprecated 3.5.0 Use {@see 'image_editor_save_pre'} instead.
 		 *
-		 * @param resource $image         Image resource to be streamed.
+		 * @param resource|GdImage $image         Image resource to be streamed.
-		 * @param int      $attachment_id The attachment post ID.
+		 * @param int              $attachment_id The attachment post 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':
 				header( 'Content-Type: image/png' );
 				return imagepng( $image );
 			case 'image/gif':
 				header( 'Content-Type: image/gif' );
 				return imagegif( $image );
+			case 'image/webp':
+				if ( function_exists( 'imagewebp' ) ) {
+					header( 'Content-Type: image/webp' );
+					return imagewebp( $image, null, 90 );
+				}
+				return false;
 			default:
 				return false;
 		}
 	}
 }
 				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 );
+			case 'image/webp':
+				if ( function_exists( 'imagewebp' ) ) {
+					return imagewebp( $image, $filename );
+				}
+				return false;
 			default:
 				return false;
 		}
 	}
 }
 * @since 2.9.0
 * @deprecated 3.5.0 Use WP_Image_Editor::rotate()
 * @see WP_Image_Editor::rotate()
 *
 * @ignore
-* @param resource  $img   Image resource.
+* @param resource|GdImage  $img   Image resource.
-* @param float|int $angle Image rotation angle, in degrees.
+* @param float|int         $angle Image rotation angle, in degrees.
-* @return resource|false GD image resource, false otherwise.
+* @return resource|GdImage|false GD image resource or GdImage instance, false otherwise.
 */
 function _rotate_image_resource( $img, $angle ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'WP_Image_Editor::rotate()' );
 	if ( function_exists( 'imagerotate' ) ) {
 		$rotated = imagerotate( $img, $angle, 0 );
-		if ( is_resource( $rotated ) ) {
+		if ( is_gd_image( $rotated ) ) {
 			imagedestroy( $img );
 			$img = $rotated;
 		}
 	}
 	return $img;
 }
 /**
 * Flips an image resource. Internal use only.
 * @since 2.9.0
 * @deprecated 3.5.0 Use WP_Image_Editor::flip()
 * @see WP_Image_Editor::flip()
 *
 * @ignore
-* @param resource $img  Image resource.
+* @param resource|GdImage $img  Image resource or GdImage instance.
-* @param bool     $horz Whether to flip horizontally.
+* @param bool             $horz Whether to flip horizontally.
-* @param bool     $vert Whether to flip vertically.
+* @param bool             $vert Whether to flip vertically.
-* @return resource (maybe) flipped image resource.
+* @return resource|GdImage (maybe) flipped image resource or GdImage instance.
 */
 function _flip_image_resource( $img, $horz, $vert ) {
 	_deprecated_function( __FUNCTION__, '3.5.0', 'WP_Image_Editor::flip()' );
 	$w   = imagesx( $img );
 	$h   = imagesy( $img );
 	$dst = wp_imagecreatetruecolor( $w, $h );
-	if ( is_resource( $dst ) ) {
+	if ( is_gd_image( $dst ) ) {
 		$sx = $vert ? ( $w - 1 ) : 0;
 		$sy = $horz ? ( $h - 1 ) : 0;
 		$sw = $vert ? -$w : $w;
 		$sh = $horz ? -$h : $h;
 		if ( imagecopyresampled( $dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh ) ) {
 			imagedestroy( $img );
 			$img = $dst;
 		}
 	}
 	return $img;
 }
 /**
 * Crops an image resource. Internal use only.
 *
 * @since 2.9.0
 *
 * @ignore
-* @param resource $img Image resource.
+* @param resource|GdImage $img Image resource or GdImage instance.
-* @param float    $x   Source point x-coordinate.
+* @param float            $x   Source point x-coordinate.
-* @param float    $y   Source point y-coordinate.
+* @param float            $y   Source point y-coordinate.
-* @param float    $w   Source width.
+* @param float            $w   Source width.
-* @param float    $h   Source height.
+* @param float            $h   Source height.
-* @return resource (maybe) cropped image resource.
+* @return resource|GdImage (maybe) cropped image resource or GdImage instance.
 */
 function _crop_image_resource( $img, $x, $y, $w, $h ) {
 	$dst = wp_imagecreatetruecolor( $w, $h );
-	if ( is_resource( $dst ) ) {
+	if ( is_gd_image( $dst ) ) {
 		if ( imagecopy( $dst, $img, 0, 0, $x, $y, $w, $h ) ) {
 			imagedestroy( $img );
 			$img = $dst;
 		}
 	}
 	return $img;
 }
 /**
 * Performs group of changes on Editor specified.
 * @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 ) ) {
+	if ( is_gd_image( $image ) ) {
 		/* 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 ) ) {
 		 *
 		 * @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 ) ) {
+	} elseif ( is_gd_image( $image ) ) {
 		/**
 		 * Filters the GD image resource before applying changes to the image.
 		 *
 		 * @since 2.9.0
 		 * @deprecated 3.5.0 Use {@see 'wp_image_editor_before_change'} instead.
 		 *
-		 * @param resource $image   GD image resource.
+		 * @param resource|GdImage $image   GD image resource or GdImage instance.
-		 * @param array    $changes Array of change operations.
+		 * @param array            $changes Array of change operations.
 		 */
 		$image = apply_filters_deprecated( 'image_edit_before_change', array( $image, $changes ), '3.5.0', 'wp_image_editor_before_change' );
 	}
 	foreach ( $changes as $operation ) {
 	if ( is_wp_error( $img ) ) {
 		$return->error = esc_js( __( 'Unable to create new image.' ) );
 		return $return;
 	}
-	$fwidth  = ! empty( $_REQUEST['fwidth'] ) ? intval( $_REQUEST['fwidth'] ) : 0;
+	$fwidth  = ! empty( $_REQUEST['fwidth'] ) ? (int) $_REQUEST['fwidth'] : 0;
-	$fheight = ! empty( $_REQUEST['fheight'] ) ? intval( $_REQUEST['fheight'] ) : 0;
+	$fheight = ! empty( $_REQUEST['fheight'] ) ? (int) $_REQUEST['fheight'] : 0;
 	$target  = ! empty( $_REQUEST['target'] ) ? preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['target'] ) : '';
 	$scale   = ! empty( $_REQUEST['do'] ) && 'scale' === $_REQUEST['do'];
 	if ( $scale && $fwidth > 0 && $fheight > 0 ) {
 		$size = $img->get_size();
 					$backup_sizes[ $tag ] = $meta['sizes'][ $size ];
 				}
 			}
 			if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {
-				$width  = intval( $_wp_additional_image_sizes[ $size ]['width'] );
+				$width  = (int) $_wp_additional_image_sizes[ $size ]['width'];
-				$height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
+				$height = (int) $_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" );

changeset 18	be944660c56a
parent 16	a86126ab1dd4
child 19	3d72ae0968f4