Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Remove default content from post format compat output. We shouldn't magically create content for display not specified by the user, especially given that the current compat is handling the case of new data, old theme. see #23347.

Browse Source 
git-svn-id: http://core.svn.wordpress.org/trunk@23499 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2013-02-27 22:10:08 +00:00
parent 236ecdd8f4
commit dabc31a559
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/post-formats.php
View File

@ -300,9 +300,6 @@ function post_formats_compat( $content, $id = 0 ) {
'class' => get_post_format_content_class( $format ),
'link_class' => '',
'image_class' => '',
'gallery' => '[gallery]',
'audio' => '',
'video' => ''
);
$args = apply_filters( 'post_format_compat', array() );
@ -376,9 +373,7 @@ function post_formats_compat( $content, $id = 0 ) {
}
}
if ( empty( $meta['gallery'] ) && ! empty( $compat['gallery'] ) ) {
$format_output .= $compat['gallery'];
} elseif ( ! empty( $meta['gallery'] ) ) {
if ( ! empty( $meta['gallery'] ) ) {
$format_output .= $meta['gallery'];
}
break;
@ -388,9 +383,7 @@ function post_formats_compat( $content, $id = 0 ) {
$shortcode_regex = '/' . get_shortcode_regex() . '/s';
$matches = preg_match( $shortcode_regex, $content );
if ( ! $matches || $format !== $matches[2] ) {
if ( empty( $meta['media'] ) && ! empty( $compat[$format] ) ) {
$format_output .= $compat[$format];
} elseif ( ! empty( $meta['media'] ) ) {
if ( ! empty( $meta['media'] ) ) {
// the metadata is a shortcode or an embed code
if ( preg_match( $shortcode_regex, $meta['media'] ) || preg_match( '#<[^>]+>#', $meta['media'] ) ) {
$format_output .= $meta['media'];