From c08fb9d1821df99f29858b02c948ea9aa4c523a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= <helen.y.hou@gmail.com>
Date: Fri, 29 Mar 2013 20:56:18 +0000
Subject: [PATCH] Since post format meta for images now takes an attachment ID
 only, make sure we label it appropriately and don't do things like esc_url()
 the value. fixes #23900.

git-svn-id: http://core.svn.wordpress.org/trunk@23874 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/post-formats.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/post-formats.php b/wp-admin/includes/post-formats.php
index be0d4580ad..84530bc131 100644
--- a/wp-admin/includes/post-formats.php
+++ b/wp-admin/includes/post-formats.php
@@ -20,8 +20,10 @@ $format_meta = get_post_format_meta( $post_ID );
 
 	<?php
 	$image = false;
-	if ( isset( $format_meta['image'] ) )
-		$image = is_numeric( $format_meta['image'] ) ? wp_get_attachment_url( $format_meta['image'] ) : $format_meta['image'];
+	if ( ! empty( $format_meta['image'] ) && is_numeric( $format_meta['image'] ) ) {
+		$format_meta['image'] = absint( $format_meta['image'] );
+		$image = wp_get_attachment_url( $format_meta['image'] );
+	}
 	?>
 	<div class="field wp-format-image">
 		<div data-format="image" class="wp-format-media-holder hide-if-no-js<?php if ( ! $image ) echo ' empty'; ?>">
@@ -36,8 +38,8 @@ $format_meta = get_post_format_meta( $post_ID );
 				?>
 			</a>
 		</div>
-		<label for="_wp_format_image" class="screen-reader-text"><?php _e( 'Image URL' ); ?>:</label>
-		<input id="wp_format_image" type="hidden" name="_wp_format_image" value="<?php echo esc_url( $format_meta['image'] ); ?>" placeholder="<?php esc_attr_e( 'Image URL' ); ?>" class="widefat" />
+		<label for="_wp_format_image" class="screen-reader-text"><?php _e( 'Attachment ID' ); ?>:</label>
+		<input id="wp_format_image" type="hidden" name="_wp_format_image" value="<?php esc_attr_e( $format_meta['image'] ); ?>" placeholder="<?php esc_attr_e( 'Attachment ID' ); ?>" class="widefat" />
 	</div>
 
 	<div class="field wp-format-link wp-format-quote wp-format-image">