<!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>[24693] trunk/wp-includes: Revert title auto-generation for asides and statuses.</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/24693">24693</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-07-12 22:35:38 +0000 (Fri, 12 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert title auto-generation for asides and statuses.
Reverts <a href="http://core.trac.wordpress.org/changeset/24043">[24043]</a> and related.
fixes <a href="http://core.trac.wordpress.org/ticket/24011">#24011</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 (24692 => 24693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2013-07-12 22:11:42 UTC (rev 24692)
+++ trunk/wp-includes/default-filters.php 2013-07-12 22:35:38 UTC (rev 24693)
</span><span class="lines">@@ -127,14 +127,10 @@
</span><span class="cx"> add_filter( 'wp_insert_post_parent', 'wp_check_post_hierarchy_for_loops', 10, 2 );
</span><span class="cx"> add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
</span><span class="cx">
</span><del>-// Pre save post data
-add_filter( 'wp_insert_post_data', '_post_formats_fix_empty_title', 10, 2 );
-
</del><span class="cx"> // Display filters
</span><span class="cx"> add_filter( 'the_title', 'wptexturize' );
</span><span class="cx"> add_filter( 'the_title', 'convert_chars' );
</span><span class="cx"> add_filter( 'the_title', 'trim' );
</span><del>-add_filter( 'the_title', '_post_formats_title', 10, 2 );
</del><span class="cx">
</span><span class="cx"> add_filter( 'the_content', 'wptexturize' );
</span><span class="cx"> add_filter( 'the_content', 'convert_smilies' );
</span></span></pre></div>
<a id="trunkwpincludespostformatsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-formats.php (24692 => 24693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-formats.php 2013-07-12 22:11:42 UTC (rev 24692)
+++ trunk/wp-includes/post-formats.php 2013-07-12 22:35:38 UTC (rev 24693)
</span><span class="lines">@@ -233,76 +233,3 @@
</span><span class="cx"> return $terms;
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'wp_get_object_terms', '_post_format_wp_get_object_terms' );
</span><del>-
-/**
- * Don't display post titles for asides and status posts on the front end.
- *
- * @since 3.6.0
- * @access private
- */
-function _post_formats_title( $title, $post_id = 0 ) {
- if ( ! $post_id || is_admin() || is_feed() || ! in_array( get_post_format( $post_id ), array( 'aside', 'status' ) ) )
- return $title;
-
- // Return an empty string only if the title is auto-generated.
- $post = get_post( $post_id );
- if ( $title == _post_formats_generate_title( $post->post_content, get_post_format( $post_id ) ) )
- $title = '';
-
- return $title;
-}
-
-/**
- * Generate a title from the post content or format.
- *
- * @since 3.6.0
- * @access private
- */
-function _post_formats_generate_title( $content, $post_format = '' ) {
- $title = wp_trim_words( strip_shortcodes( $content ), 8, '' );
-
- if ( empty( $title ) )
- $title = get_post_format_string( $post_format );
-
- return $title;
-}
-
-/**
- * Fixes empty titles for aside and status formats.
- *
- * Passes a generated post title to the 'wp_insert_post_data' filter.
- *
- * @since 3.6.0
- * @access private
- *
- * @uses _post_formats_generate_title()
- */
-function _post_formats_fix_empty_title( $data, $postarr ) {
- if ( 'auto-draft' == $data['post_status'] || ! post_type_supports( $data['post_type'], 'post-formats' ) )
- return $data;
-
- $post_id = ( isset( $postarr['ID'] ) ) ? absint( $postarr['ID'] ) : 0;
- $post_format = '';
-
- if ( $post_id )
- $post_format = get_post_format( $post_id );
-
- if ( isset( $postarr['post_format'] ) )
- $post_format = ( in_array( $postarr['post_format'], get_post_format_slugs() ) ) ? $postarr['post_format'] : '';
-
- if ( ! in_array( $post_format, array( 'aside', 'status' ) ) )
- return $data;
-
- if ( $data['post_title'] == _post_formats_generate_title( $data['post_content'], $post_format ) )
- return $data;
-
- // If updating an existing post, check whether the title was auto-generated.
- if ( $post_id && $post = get_post( $post_id ) )
- if ( $post->post_title == $data['post_title'] && $post->post_title == _post_formats_generate_title( $post->post_content, get_post_format( $post->ID ) ) )
- $data['post_title'] = '';
-
- if ( empty( $data['post_title'] ) )
- $data['post_title'] = _post_formats_generate_title( $data['post_content'], $post_format );
-
- return $data;
-}
</del></span></pre>
</div>
</div>
</body>
</html>