Index: wp-admin/includes/post-formats.php =================================================================== --- wp-admin/includes/post-formats.php (revision 24019) +++ wp-admin/includes/post-formats.php (working copy) @@ -11,28 +11,30 @@ $format_meta = get_post_format_meta( $post_ID );
- +
- +
- +
', esc_url( $image ), get_the_title( $format_meta['image'] ) ); - } elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $format_meta['image'] ) ) { - echo do_shortcode( $format_meta['image'] ); - } elseif ( ! preg_match( '#<[^>]+>#', $format_meta['image'] ) ) { - printf( '', esc_url( $format_meta['image'] ) ); + } elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $value ) ) { + echo do_shortcode( $value ); + } elseif ( ! preg_match( '#<[^>]+>#', $value ) ) { + printf( '', esc_url( $value ) ); } else { - echo $format_meta['image']; + echo $value; } ?>
@@ -53,27 +55,39 @@ $format_meta = get_post_format_meta( $post_ID );
-
- - +
+ + +
+ +
+ + +
+ +
+ +
- +
]+>#', $format_meta['video'] ) ) { - if ( strstr( $format_meta['video'], home_url() ) ) - echo do_shortcode( sprintf( '[video src="%s"]', $format_meta['video'] ) ); + } elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $value ) ) { + echo do_shortcode( $value ); + } elseif ( ! preg_match( '#<[^>]+>#', $value ) ) { + if ( strstr( $value, home_url() ) ) + echo do_shortcode( sprintf( '[video src="%s"]', $value ) ); else - echo $wp_embed->autoembed( $format_meta['video'] ); + echo $wp_embed->autoembed( $value ); } else { - echo $format_meta['video']; + echo $value; } ?>
@@ -84,7 +98,7 @@ $format_meta = get_post_format_meta( $post_ID ); else _e( 'Video URL' ); ?> - +
- +
]+>#', $format_meta['audio'] ) ) { - if ( strstr( $format_meta['audio'], home_url() ) ) - echo do_shortcode( sprintf( '[audio src="%s"]', $format_meta['audio'] ) ); + } elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $value ) ) { + echo do_shortcode( $value ); + } elseif ( ! preg_match( '#<[^>]+>#', $value ) ) { + if ( strstr( $value, home_url() ) ) + echo do_shortcode( sprintf( '[audio src="%s"]', $value ) ); else - echo $wp_embed->autoembed( $format_meta['audio'] ); + echo $wp_embed->autoembed( $value ); } else { - echo $format_meta['audio']; + echo $value; } ?>
@@ -120,7 +136,7 @@ $format_meta = get_post_format_meta( $post_ID ); else _e( 'Audio URL' ); ?> - +
Index: wp-admin/includes/post.php =================================================================== --- wp-admin/includes/post.php (revision 24019) +++ wp-admin/includes/post.php (working copy) @@ -192,22 +192,25 @@ function edit_post( $post_data = null ) { } // Post Formats - if ( isset( $post_data['post_format'] ) ) { + if ( isset( $post_data['post_format'] ) ) set_post_format( $post_ID, $post_data['post_format'] ); - } - if ( isset( $post_data[ '_wp_format_url' ] ) ) { - update_post_meta( $post_ID, '_wp_format_url', wp_slash( esc_url_raw( wp_unslash( $post_data['_wp_format_url'] ) ) ) ); + $format_meta_urls = array( 'url', 'link_url', 'quote_source_url' ); + foreach ( $format_meta_urls as $format_meta_url ) { + $keyed = '_format_' . $format_meta_url; + if ( isset( $post_data[ $keyed ] ) ) + update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) ); } - $format_keys = array( 'quote', 'quote_source', 'image', 'gallery', 'audio', 'video' ); + $format_keys = array( 'quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed' ); foreach ( $format_keys as $key ) { - if ( isset( $post_data[ '_wp_format_' . $key ] ) ) { + $keyed = '_format_' . $key; + if ( isset( $post_data[ $keyed ] ) ) { if ( current_user_can( 'unfiltered_html' ) ) - update_post_meta( $post_ID, '_wp_format_' . $key, $post_data[ '_wp_format_' . $key ] ); + update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] ); else - update_post_meta( $post_ID, '_wp_format_' . $key, wp_filter_post_kses( $post_data[ '_wp_format_' . $key ] ) ); + update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) ); } } Index: wp-admin/js/post-formats.js =================================================================== --- wp-admin/js/post-formats.js (revision 24019) +++ wp-admin/js/post-formats.js (working copy) @@ -1,7 +1,7 @@ window.wp = window.wp || {}; (function($) { - var container, mediaFrame, lastMimeType, lastMenu, mediaPreview, + var container, mediaFrame, lastMimeType, mediaPreview, noUIFormats = ['standard', 'chat', 'status', 'aside', 'gallery'], $container = $( '.post-formats-fields' ); @@ -76,7 +76,7 @@ window.wp = window.wp || {}; // Media selection $('.wp-format-media-select').click(function(event) { event.preventDefault(); - var $el = $(this), mime, + var $el = $(this), mime = 'image', $holder = $el.closest('.wp-format-media-holder'), $field = $( '#wp_format_' + $holder.data('format') ); Index: wp-includes/js/autosave.js =================================================================== --- wp-includes/js/autosave.js (revision 24019) +++ wp-includes/js/autosave.js (working copy) @@ -367,7 +367,7 @@ wp.autosave.getPostData = function() { post_format = $('#post_format').val() || ''; data['post_format'] = post_format == 'standard' ? '' : post_format; - $('.post-formats-fields').find('input[name^="_wp_format_"], textarea[name^="_wp_format_"]').each( function(i, field) { + $('.post-formats-fields').find('input[name^="_format_"], textarea[name^="_format_"]').each( function(i, field) { data[ field.name ] = field.value || ''; }); Index: wp-includes/media.php =================================================================== --- wp-includes/media.php (revision 24019) +++ wp-includes/media.php (working copy) @@ -2074,21 +2074,22 @@ function get_the_post_format_media( $type, &$post = null, $limit = 0 ) { if ( has_post_format( $type, $post ) ) { $meta = get_post_format_meta( $post->ID ); - if ( ! empty( $meta[$type] ) ) { - if ( is_integer( $meta[$type] ) ) { - $url = wp_get_attachment_url( $meta[$type] ); + if ( ! empty( $meta[$type . '_embed'] ) ) { + $value = $meta[$type . '_embed']; + if ( is_integer( $value ) ) { + $url = wp_get_attachment_url( $value ); $shortcode = sprintf( '[%s src="%s"]', $type, $url ); - } elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $meta[$type] ) ) { - $shortcode = $meta[$type]; - } elseif ( preg_match( '#<[^>]+>#', $meta[$type] ) ) { - $post->format_content = $meta[$type]; + } elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $value ) ) { + $shortcode = $value; + } elseif ( preg_match( '#<[^>]+>#', $value ) ) { + $post->format_content = $value; return $post->format_content; - } elseif ( 0 === strpos( $meta[$type], 'http' ) ) { - $post->split_content = str_replace( $meta[$type], '', $post->post_content, $count ); - if ( strstr( $meta[$type], home_url() ) ) { - $shortcode = sprintf( '[%s src="%s"]', $type, $meta[$type] ); + } elseif ( 0 === strpos( $value, 'http' ) ) { + $post->split_content = str_replace( $value, '', $post->post_content, $count ); + if ( strstr( $value, home_url() ) ) { + $shortcode = sprintf( '[%s src="%s"]', $type, $value ); } else { - $post->format_content = $wp_embed->autoembed( $meta[$type] ); + $post->format_content = $wp_embed->autoembed( $value ); return $post->format_content; } } Index: wp-includes/post-formats.php =================================================================== --- wp-includes/post-formats.php (revision 24019) +++ wp-includes/post-formats.php (working copy) @@ -81,18 +81,44 @@ function set_post_format( $post, $format ) { * @return array The array of post format metadata. */ function get_post_format_meta( $post_id = 0 ) { - $values = array( - 'quote' => '', - 'quote_source' => '', - 'url' => '', - 'image' => '', - 'gallery' => '', - 'audio' => '', - 'video' => '', + $meta = get_post_meta( $post_id ); + + if ( empty( $meta ) ) + return array(); + + $upgrade = array( + '_wp_format_quote_source' => 'quote_source_name', + '_wp_format_audio' => 'audio_embed', + '_wp_format_video' => 'video_embed' ); - foreach ( $values as $key => $value ) - $values[$key] = get_post_meta( $post_id, '_wp_format_' . $key, true ); + $format = get_post_format( $post_id ); + if ( ! empty( $format ) ) { + switch ( $format ) { + case 'link': + $upgrade['_wp_format_url'] = 'link_url'; + break; + case 'quote': + $upgrade['_wp_format_url'] = 'quote_source_url'; + break; + } + } + + $upgrade_keys = array_keys( $upgrade ); + foreach ( $meta as $key => $values ) { + if ( ! in_array( $key, $upgrade_keys ) ) + continue; + update_post_meta( $post_id, '_format_' . $upgrade[$key], reset( $values ) ); + delete_post_meta( $post_id, $key ); + } + + $keys = array( 'quote', 'quote_source_name', 'quote_source_url', 'link_url', 'gallery', 'audio_embed', 'video_embed', 'url', 'image' ); + $values = array(); + + foreach ( $keys as $key ) { + $value = get_post_meta( $post_id, '_format_' . $key, true ); + $values[$key] = empty( $value ) ? '' : $value; + } return $values; } @@ -324,11 +350,11 @@ function post_formats_compat( $content, $id = 0 ) { $compat['tag'] = ''; $compat['position'] = 'before'; - if ( ! empty( $meta['url'] ) ) { - $esc_url = preg_quote( $meta['url'], '#' ); + if ( ! empty( $meta['link_url'] ) ) { + $esc_url = preg_quote( $meta['link_url'], '#' ); // Make sure the same URL isn't in the post (modified/extended versions allowed) if ( ! preg_match( '#' . $esc_url . '[^/&\?]?#', $content ) ) { - $url = $meta['url']; + $url = $meta['link_url']; } else { $url = get_content_url( $content, true ); } @@ -344,7 +370,7 @@ function post_formats_compat( $content, $id = 0 ) { '%s', empty( $compat['link_class'] ) ? '' : sprintf( 'class="%s" ', esc_attr( $compat['link_class'] ) ), esc_url( $url ), - empty( $post->post_title ) ? esc_url( $meta['url'] ) : apply_filters( 'the_title', $post->post_title, $post->ID ) + empty( $post->post_title ) ? esc_url( $meta['link_url'] ) : apply_filters( 'the_title', $post->post_title, $post->ID ) ); } break; @@ -376,7 +402,7 @@ function post_formats_compat( $content, $id = 0 ) { if ( ! empty( $meta['quote'] ) && ! stristr( $content, $meta['quote'] ) ) { $quote = sprintf( '
%s
', wpautop( $meta['quote'] ) ); if ( ! empty( $meta['quote_source'] ) ) { - $source = ( empty( $meta['url'] ) ) ? $meta['quote_source'] : sprintf( '%s', esc_url( $meta['url'] ), $meta['quote_source'] ); + $source = ( empty( $meta['quote_source_url'] ) ) ? $meta['quote_source_name'] : sprintf( '%s', esc_url( $meta['quote_source_url'] ), $meta['quote_source_name'] ); $quote .= sprintf( '
%s
', $source ); } $format_output .= sprintf( '
%s
', $quote ); @@ -385,17 +411,18 @@ function post_formats_compat( $content, $id = 0 ) { case 'video': case 'audio': - if ( ! has_shortcode( $post->post_content, $format ) && ! empty( $meta[$format] ) ) { + if ( ! has_shortcode( $post->post_content, $format ) && ! empty( $meta[$format . '_embed'] ) ) { + $value = $meta[$format . '_embed']; // the metadata is an attachment ID - if ( is_numeric( $meta[$format] ) ) { - $url = wp_get_attachment_url( $meta[$format] ); + if ( is_numeric( $value ) ) { + $url = wp_get_attachment_url( $value ); $format_output .= sprintf( '[%s src="%s"]', $format, $url ); // the metadata is a shortcode or an embed code - } elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $meta[$format] ) || preg_match( '#<[^>]+>#', $meta[$format] ) ) { - $format_output .= $meta[$format]; - } elseif ( ! stristr( $content, $meta[$format] ) ) { + } elseif ( preg_match( '/' . get_shortcode_regex() . '/s', $value ) || preg_match( '#<[^>]+>#', $value ) ) { + $format_output .= $value; + } elseif ( ! stristr( $content, $value ) ) { // attempt to embed the URL - $format_output .= sprintf( '[embed]%s[/embed]', $meta[$format] ); + $format_output .= sprintf( '[embed]%s[/embed]', $value ); } } break; @@ -707,10 +734,28 @@ function get_the_post_format_url( $id = 0 ) { if ( empty( $post ) ) return ''; - if ( in_array( get_post_format( $post->ID ), array( 'image', 'link', 'quote' ) ) ) { + $format = get_post_format( $post->ID ); + if ( in_array( $format, array( 'image', 'link', 'quote' ) ) ) { $meta = get_post_format_meta( $post->ID ); - if ( ! empty( $meta['url'] ) ) - return apply_filters( 'get_the_post_format_url', esc_url_raw( $meta['url'] ), $post ); + $meta_link = ''; + + switch ( $format ) { + case 'link': + if ( ! empty( $meta['link_url'] ) ) + $meta_link = $meta['link_url']; + break; + case 'image': + if ( ! empty( $meta['url'] ) ) + $meta_link = $meta['url']; + break; + case 'quote': + if ( ! empty( $meta['quote_source_url'] ) ) + $meta_link = $meta['quote_source_url']; + break; + } + + if ( ! empty( $meta_link ) ) + return apply_filters( 'get_the_post_format_url', esc_url_raw( $meta_link ), $post ); } if ( ! empty( $post->post_content ) ) Index: wp-includes/revision.php =================================================================== --- wp-includes/revision.php (revision 24019) +++ wp-includes/revision.php (working copy) @@ -68,13 +68,15 @@ function _wp_post_revision_fields( $post = null, $autosave = false ) { */ function _wp_post_revision_meta_keys() { return array( - '_wp_format_url', - '_wp_format_quote', - '_wp_format_quote_source', - '_wp_format_image', - '_wp_format_gallery', - '_wp_format_audio', - '_wp_format_video', + '_format_url', + '_format_link_url', + '_format_quote_source_url', + '_format_quote_source_name', + '_format_quote', + '_format_image', + '_format_gallery', + '_format_audio_embed', + '_format_video_embed', ); }