Index: wp-includes/post-formats.php
===================================================================
--- wp-includes/post-formats.php	(revision 24236)
+++ wp-includes/post-formats.php	(working copy)
@@ -81,6 +81,10 @@
  * @return array The array of post format metadata.
  */
 function get_post_format_meta( $post_id = 0 ) {
+	if ( ! $post = get_post( $post_id ) )
+		return apply_filters( 'post_format_meta', array(), $post_id );
+
+	$post_id = $post->ID;
 	$meta = get_post_meta( $post_id );
 	$keys = array( 'quote', 'quote_source_name', 'quote_source_url', 'link_url', 'gallery', 'audio_embed', 'video_embed', 'url', 'image' );
 
@@ -120,7 +124,7 @@
 		$values[$key] = empty( $value ) ? '' : $value;
 	}
 
-	return apply_filters( 'post_format_meta', $values );
+	return apply_filters( 'post_format_meta', $values, $post_id );
 }
 
 /**