<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24387] trunk/wp-includes: Revert [23450].</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24387">24387</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-05-30 17:55:22 +0000 (Thu, 30 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://core.trac.wordpress.org/changeset/23450">[23450]</a>. Removes post format compat.
see <a href="http://core.trac.wordpress.org/ticket/23347">#23347</a>, <a href="http://core.trac.wordpress.org/ticket/24452">#24452</a>. closes <a href="http://core.trac.wordpress.org/ticket/24454">#24454</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
<li><a href="#trunkwpincludespostformatsphp">trunk/wp-includes/post-formats.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (24386 => 24387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2013-05-30 17:55:14 UTC (rev 24386)
+++ trunk/wp-includes/default-filters.php 2013-05-30 17:55:22 UTC (rev 24387)
</span><span class="lines">@@ -136,13 +136,12 @@
</span><span class="cx"> add_filter( 'the_title', 'trim' );
</span><span class="cx"> add_filter( 'the_title', '_post_formats_title', 10, 2 );
</span><span class="cx">
</span><del>-add_filter( 'the_content', 'post_formats_compat', 7, 2 );
-add_filter( 'the_content', 'wptexturize' );
-add_filter( 'the_content', 'convert_smilies' );
-add_filter( 'the_content', 'convert_chars' );
-add_filter( 'the_content', 'wpautop' );
-add_filter( 'the_content', 'shortcode_unautop' );
-add_filter( 'the_content', 'prepend_attachment' );
</del><ins>+add_filter( 'the_content', 'wptexturize' );
+add_filter( 'the_content', 'convert_smilies' );
+add_filter( 'the_content', 'convert_chars' );
+add_filter( 'the_content', 'wpautop' );
+add_filter( 'the_content', 'shortcode_unautop' );
+add_filter( 'the_content', 'prepend_attachment' );
</ins><span class="cx">
</span><span class="cx"> add_filter( 'the_excerpt', 'wptexturize' );
</span><span class="cx"> add_filter( 'the_excerpt', 'convert_smilies' );
</span></span></pre></div>
<a id="trunkwpincludespostformatsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-formats.php (24386 => 24387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-formats.php 2013-05-30 17:55:14 UTC (rev 24386)
+++ trunk/wp-includes/post-formats.php 2013-05-30 17:55:22 UTC (rev 24387)
</span><span class="lines">@@ -286,186 +286,6 @@
</span><span class="cx"> add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Return the class for a post format content wrapper
- *
- * @since 3.6.0
- *
- * @param string $format The post format slug, such as status, quote, image, gallery, etc.
- * @return string Filtered post format content class.
- */
-function get_post_format_content_class( $format ) {
- return apply_filters( 'post_format_content_class', 'post-format-content', $format );
-}
-
-/**
- * Output the class for a post format content wrapper
- *
- * @since 3.6.0
- *
- * @param string $format The post format slug, such as status, quote, image, gallery, etc.
- */
-function post_format_content_class( $format ) {
- echo get_post_format_content_class( $format );
-}
-
-/**
- * Provide fallback behavior for Posts that have associated post format
- *
- * @since 3.6.0
- *
- * @uses get_post_format_meta()
- *
- * @param string $content The post content.
- * @param int $post_id (optional) The post ID.
- * @return string Formatted output based on associated post format.
- */
-function post_formats_compat( $content, $post_id = 0 ) {
- if ( ! $post = get_post( $post_id ) )
- return $content;
-
- $format = get_post_format( $post );
- if ( empty( $format ) || in_array( $format, array( 'status', 'aside', 'chat', 'gallery' ) ) )
- return $content;
-
- if ( current_theme_supports( 'structured-post-formats', $format ) )
- return $content;
-
- $defaults = array(
- 'position' => 'after',
- 'tag' => 'div',
- 'class' => get_post_format_content_class( $format ),
- 'link_class' => '',
- );
-
- $args = apply_filters( 'post_format_compat', array() );
- $compat = wp_parse_args( $args, $defaults );
-
- $show_content = true;
- $format_output = '';
- $meta = get_post_format_meta( $post->ID );
-
- switch ( $format ) {
- case 'link':
- 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['link_url'];
- } else {
- $url = get_content_url( $content, true );
- }
- } else {
- $content_before = $content;
- $url = get_content_url( $content, true );
- if ( $content_before == $content )
- $url = '';
- }
-
- if ( ! empty( $url ) ) {
- $format_output .= sprintf(
- '<a %shref="%s">%s</a>',
- empty( $compat['link_class'] ) ? '' : sprintf( 'class="%s" ', esc_attr( $compat['link_class'] ) ),
- esc_url( $url ),
- empty( $post->post_title ) ? esc_url( $url ) : apply_filters( 'the_title', $post->post_title, $post->ID )
- );
- }
- break;
-
- case 'image':
- if ( ! empty( $meta['image'] ) ) {
-
- if ( has_shortcode( $meta['image'], 'caption' ) ) {
- // wrap <img> in <a>
- if ( ! empty( $meta['url'] ) && false === strpos( $meta['image'], '<a ' ) ) {
- $meta['image'] = preg_replace(
- '#(<img[^>]+>)#',
- sprintf( '<a href="%s">$1</a>', esc_url( $meta['url'] ) ),
- $meta['image']
- );
- }
- $format_output .= do_shortcode( $meta['image'] );
- } else {
-
- if ( is_numeric( $meta['image'] ) ) {
- $image = wp_get_attachment_image( absint( $meta['image'] ), 'full' );
- } elseif ( ! preg_match( '#<[^>]+>#', $meta['image'] ) ) {
- // not HTML, assume URL
- $image = sprintf(
- '<img %ssrc="%s" alt="" />',
- empty( $compat['image_class'] ) ? '' : sprintf( 'class="%s" ', esc_attr( $compat['image_class'] ) ),
- esc_url( $meta['image'] )
- );
- } else {
- // assume HTML
- $image = $meta['image'];
- }
-
- if ( ! empty( $meta['url'] ) && false === strpos( $image, '<a ' ) ) {
- $format_output .= sprintf(
- '<a href="%s">%s</a>',
- esc_url( $meta['url'] ),
- $image
- );
- } else {
- $format_output .= $image;
- }
- }
- }
- break;
-
- case 'quote':
- $quote = get_the_post_format_quote( $post );
-
- // Replace the existing quote in-place.
- if ( ! empty( $quote ) )
- get_content_quote( $content, true, $quote );
- break;
-
- case 'video':
- case 'audio':
- if ( ! has_shortcode( $post->post_content, $format ) && ! empty( $meta[$format . '_embed'] ) ) {
- $value = $meta[$format . '_embed'];
- // the metadata is an attachment ID
- 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', $value ) || preg_match( '#<[^>]+>#', $value ) ) {
- $format_output .= $value;
- } elseif ( ! stristr( $content, $value ) ) {
- // attempt to embed the URL
- $format_output .= sprintf( '[embed]%s[/embed]', $value );
- }
- }
- break;
- default:
- return $content;
- break;
- }
-
- if ( empty( $format_output ) )
- return $content;
-
- $output = '';
-
- if ( ! empty( $content ) && $show_content && 'before' !== $compat['position'] )
- $output .= $content . "\n\n";
-
- if ( ! empty( $compat['tag'] ) )
- $output .= sprintf( '<%s class="%s">', tag_escape( $compat['tag'] ), esc_attr( $compat['class'] ) );
-
- $output .= "\n\n" . $format_output;
-
- if ( ! empty( $compat['tag'] ) )
- $output .= sprintf( '</%s>', tag_escape( $compat['tag'] ) );
-
- if ( ! empty( $content ) && $show_content && 'before' === $compat['position'] )
- $output .= "\n\n" . $content;
-
- return $output;
-}
-
-/**
</del><span class="cx"> * Add chat detection support to the `get_content_chat()` chat parser.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.6.0
</span></span></pre>
</div>
</div>
</body>
</html>