X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41578db67d72562346e4dbb2a14889b23d522813..849f15aeed7a5e39314057bdc0064d8edd60dd7d:/wp-admin/includes/image-edit.php

diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php
index 9e0f3844..7e3e7f7e 100644
--- a/wp-admin/includes/image-edit.php
+++ b/wp-admin/includes/image-edit.php
@@ -6,6 +6,10 @@
  * @subpackage Administration
  */
 
+/**
+ * @param int $post_id
+ * @param bool|object $msg
+ */
 function wp_image_editor($post_id, $msg = false) {
 	$nonce = wp_create_nonce("image_editor-$post_id");
 	$meta = wp_get_attachment_metadata($post_id);
@@ -144,12 +148,12 @@ function wp_image_editor($post_id, $msg = false) {
 	<?php } ?>
 
 	</div>
-	
+
 	<div class="imgedit-panel-content">
 		<?php echo $note; ?>
 		<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
-	
+
 		// 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' ) ) ) ) { ?>
 			<div class="imgedit-rleft"  onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate counter-clockwise' ); ?>"></div>
@@ -160,33 +164,32 @@ function wp_image_editor($post_id, $msg = false) {
 		    <div class="imgedit-rleft disabled"  title="<?php echo $note_no_rotate; ?>"></div>
 		    <div class="imgedit-rright disabled" title="<?php echo $note_no_rotate; ?>"></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>
-	
+
 		<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 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); ?>" />
 		</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 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>
 	<script type="text/javascript">jQuery( function() { imageEdit.init(<?php echo $post_id; ?>); });</script>
@@ -400,9 +403,11 @@ function _crop_image_resource($img, $x, $y, $w, $h) {
 /**
  * Performs group of changes on Editor specified.
  *
- * @param WP_Image_Editor $image
- * @param type $changes
- * @return WP_Image_Editor
+ * @since 2.9.0
+ *
+ * @param WP_Image_Editor $image   {@see WP_Image_Editor} instance.
+ * @param array           $changes Array of change operations.
+ * @return WP_Image_Editor {@see WP_Image_Editor} instance with changes applied.
  */
 function image_edit_apply_changes( $image, $changes ) {
 	if ( is_resource( $image ) )
@@ -411,7 +416,7 @@ function image_edit_apply_changes( $image, $changes ) {
 	if ( !is_array($changes) )
 		return $image;
 
-	// expand change operations
+	// Expand change operations.
 	foreach ( $changes as $key => $obj ) {
 		if ( isset($obj->r) ) {
 			$obj->type = 'rotate';
@@ -429,7 +434,7 @@ function image_edit_apply_changes( $image, $changes ) {
 		$changes[$key] = $obj;
 	}
 
-	// combine operations
+	// Combine operations.
 	if ( count($changes) > 1 ) {
 		$filtered = array($changes[0]);
 		for ( $i = 0, $j = 1; $j < count($changes); $j++ ) {
@@ -453,7 +458,7 @@ function image_edit_apply_changes( $image, $changes ) {
 		unset($filtered);
 	}
 
-	// image resource before applying the changes
+	// Image resource before applying the changes.
 	if ( $image instanceof WP_Image_Editor ) {
 
 		/**
@@ -540,7 +545,7 @@ function stream_preview_image( $post_id ) {
 	if ( $changes )
 		$img = image_edit_apply_changes( $img, $changes );
 
-	// scale the image
+	// Scale the image.
 	$size = $img->get_size();
 	$w = $size['width'];
 	$h = $size['height'];
@@ -555,6 +560,10 @@ function stream_preview_image( $post_id ) {
 	return wp_stream_image( $img, $post->post_mime_type, $post_id );
 }
 
+/**
+ * @param int $post_id
+ * @return stdClass
+ */
 function wp_restore_image($post_id) {
 	$meta = wp_get_attachment_metadata($post_id);
 	$file = get_attached_file($post_id);
@@ -576,7 +585,8 @@ function wp_restore_image($post_id) {
 
 		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 edited image.
 				if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
 
 					/** This filter is documented in wp-admin/custom-header.php */
@@ -601,7 +611,8 @@ 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 ) {
-					// delete only if it's edited image
+
+					// Delete only if it's edited image
 					if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
 						/** This filter is documented in wp-admin/custom-header.php */
 						$delpath = apply_filters( 'wp_delete_file', path_join($parts['dirname'], $meta['sizes'][$default_size]['file']) );
@@ -661,10 +672,10 @@ function wp_save_image( $post_id ) {
 		$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 ) {
-			// scale the full size image
+			// Scale the full size image.
 			if ( $img->resize( $fwidth, $fheight ) )
 				$scaled = true;
 		}
@@ -693,7 +704,7 @@ function wp_save_image( $post_id ) {
 	if ( !is_array($backup_sizes) )
 		$backup_sizes = array();
 
-	// generate new filename
+	// Generate new filename.
 	$path = get_attached_file($post_id);
 	$path_parts = pathinfo( $path );
 	$filename = $path_parts['filename'];
@@ -719,7 +730,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;
@@ -804,10 +815,11 @@ function wp_save_image( $post_id ) {
 				$return->thumbnail = $thumb_url[0];
 			} else {
 				$file_url = wp_get_attachment_url($post_id);
-				if ( $thumb = $meta['sizes']['thumbnail'] )
+				if ( ! empty( $meta['sizes']['thumbnail'] ) && $thumb = $meta['sizes']['thumbnail'] ) {
 					$return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
-				else
+				} else {
 					$return->thumbnail = "$file_url?w=128&h=128";
+				}
 			}
 		}
 	} else {