<!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>[23899] trunk: Standardize the post format theme API functions with the_post_format_THING() and get_the_post_format_THING().</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, #logmsg > ol { margin-left: 0; 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/23899">23899</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-04-04 08:09:02 +0000 (Thu, 04 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Standardize the post format theme API functions with the_post_format_THING() and get_the_post_format_THING().
fixes <a href="http://core.trac.wordpress.org/ticket/23927">#23927</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenfunctionsphp">trunk/wp-content/themes/twentyeleven/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteencontentaudiophp">trunk/wp-content/themes/twentythirteen/content-audio.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteencontentchatphp">trunk/wp-content/themes/twentythirteen/content-chat.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteencontentvideophp">trunk/wp-content/themes/twentythirteen/content-video.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenfunctionsphp">trunk/wp-content/themes/twentythirteen/functions.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludespostformatsphp">trunk/wp-includes/post-formats.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/functions.php (23898 => 23899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/functions.php 2013-04-04 07:53:49 UTC (rev 23898)
+++ trunk/wp-content/themes/twentyeleven/functions.php 2013-04-04 08:09:02 UTC (rev 23899)
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function twentyeleven_get_first_url() {
</span><del>- $has_url = function_exists( 'get_the_url' ) ? get_the_url() : false;
</del><ins>+ $has_url = function_exists( 'get_the_post_format_url' ) ? get_the_post_format_url() : false;
</ins><span class="cx">
</span><span class="cx"> if ( ! $has_url )
</span><span class="cx"> $has_url = twentyeleven_url_grabber();
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteencontentaudiophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/content-audio.php (23898 => 23899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/content-audio.php 2013-04-04 07:53:49 UTC (rev 23898)
+++ trunk/wp-content/themes/twentythirteen/content-audio.php 2013-04-04 08:09:02 UTC (rev 23899)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="entry-media">
</span><span class="cx"> <div class="audio-content">
</span><del>- <?php the_audio(); ?>
</del><ins>+ <?php the_post_format_audio(); ?>
</ins><span class="cx"> </div><!-- .audio-content -->
</span><span class="cx"> </div><!-- .entry-media -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteencontentchatphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/content-chat.php (23898 => 23899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/content-chat.php 2013-04-04 07:53:49 UTC (rev 23898)
+++ trunk/wp-content/themes/twentythirteen/content-chat.php 2013-04-04 08:09:02 UTC (rev 23899)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> </header><!-- .entry-header -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-content">
</span><del>- <?php the_chat(); ?>
</del><ins>+ <?php the_post_format_chat(); ?>
</ins><span class="cx"> <?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'twentythirteen' ) . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteencontentvideophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/content-video.php (23898 => 23899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/content-video.php 2013-04-04 07:53:49 UTC (rev 23898)
+++ trunk/wp-content/themes/twentythirteen/content-video.php 2013-04-04 08:09:02 UTC (rev 23899)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx">
</span><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <div class="entry-media">
</span><del>- <?php the_video(); ?>
</del><ins>+ <?php the_post_format_video(); ?>
</ins><span class="cx"> </div><!-- .entry-media -->
</span><span class="cx">
</span><span class="cx"> <header class="entry-header">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/functions.php (23898 => 23899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/functions.php 2013-04-04 07:53:49 UTC (rev 23898)
+++ trunk/wp-content/themes/twentythirteen/functions.php 2013-04-04 08:09:02 UTC (rev 23899)
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx"> * @return string URL
</span><span class="cx"> */
</span><span class="cx"> function twentythirteen_get_link_url() {
</span><del>- $has_url = get_the_url();
</del><ins>+ $has_url = get_the_post_format_url();
</ins><span class="cx">
</span><span class="cx"> return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (23898 => 23899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2013-04-04 07:53:49 UTC (rev 23898)
+++ trunk/wp-includes/media.php 2013-04-04 08:09:02 UTC (rev 23899)
</span><span class="lines">@@ -2031,7 +2031,7 @@
</span><span class="cx"> * @param WP_Post $post Optional. Used instead of global $post when passed.
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>-function get_the_media( $type, &$post = null ) {
</del><ins>+function get_the_post_format_media( $type, &$post = null ) {
</ins><span class="cx"> global $wp_embed;
</span><span class="cx">
</span><span class="cx"> if ( empty( $post ) )
</span><span class="lines">@@ -2118,8 +2118,8 @@
</span><span class="cx"> * @since 3.6.0
</span><span class="cx"> *
</span><span class="cx"> */
</span><del>-function the_video() {
- echo get_the_media( 'video' );
</del><ins>+function the_post_format_video() {
+ echo get_the_post_format_media( 'video' );
</ins><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Output the first audio in the current (@global) post's content
</span><span class="lines">@@ -2127,8 +2127,8 @@
</span><span class="cx"> * @since 3.6.0
</span><span class="cx"> *
</span><span class="cx"> */
</span><del>-function the_audio() {
- echo get_the_media( 'audio' );
</del><ins>+function the_post_format_audio() {
+ echo get_the_post_format_media( 'audio' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2360,7 +2360,7 @@
</span><span class="cx"> * @param string $attached_size If an attached image is found, the size to display it.
</span><span class="cx"> * @param WP_Post $post Optional. Used instead of global $post when passed.
</span><span class="cx"> */
</span><del>-function get_the_image( $attached_size = 'full', &$post = null ) {
</del><ins>+function get_the_post_format_image( $attached_size = 'full', &$post = null ) {
</ins><span class="cx"> if ( empty( $post ) )
</span><span class="cx"> $post = get_post();
</span><span class="cx">
</span><span class="lines">@@ -2435,6 +2435,6 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $attached_size If an attached image is found, the size to display it.
</span><span class="cx"> */
</span><del>-function the_image( $attached_size = 'full' ) {
- echo get_the_image( $attached_size );
</del><ins>+function the_post_format_image( $attached_size = 'full' ) {
+ echo get_the_post_format_image( $attached_size );
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludespostformatsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-formats.php (23898 => 23899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-formats.php 2013-04-04 07:53:49 UTC (rev 23898)
+++ trunk/wp-includes/post-formats.php 2013-04-04 08:09:02 UTC (rev 23899)
</span><span class="lines">@@ -574,7 +574,7 @@
</span><span class="cx"> * @param int $id Optional. Post ID
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><del>-function get_the_chat( $id = 0 ) {
</del><ins>+function get_the_post_format_chat( $id = 0 ) {
</ins><span class="cx"> $post = empty( $id ) ? clone get_post() : get_post( $id );
</span><span class="cx"> if ( empty( $post ) )
</span><span class="cx"> return array();
</span><span class="lines">@@ -592,13 +592,13 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.6.0
</span><span class="cx"> *
</span><del>- * @uses get_the_chat()
</del><ins>+ * @uses get_the_post_format_chat()
</ins><span class="cx"> *
</span><span class="cx"> * @print HTML
</span><span class="cx"> */
</span><del>-function the_chat() {
</del><ins>+function the_post_format_chat() {
</ins><span class="cx"> $output = '<dl class="chat">';
</span><del>- $stanzas = get_the_chat();
</del><ins>+ $stanzas = get_the_post_format_chat();
</ins><span class="cx">
</span><span class="cx"> foreach ( $stanzas as $stanza ) {
</span><span class="cx"> foreach ( $stanza as $row ) {
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx"> * @param int $id Optional. Post ID.
</span><span class="cx"> * @return string A URL, if found.
</span><span class="cx"> */
</span><del>-function get_the_url( $id = 0 ) {
</del><ins>+function get_the_post_format_url( $id = 0 ) {
</ins><span class="cx"> $post = empty( $id ) ? get_post() : get_post( $id );
</span><span class="cx"> if ( empty( $post ) )
</span><span class="cx"> return '';
</span><span class="lines">@@ -681,11 +681,11 @@
</span><span class="cx"> if ( in_array( get_post_format( $post->ID ), array( 'link', 'quote' ) ) ) {
</span><span class="cx"> $meta = get_post_format_meta( $post->ID );
</span><span class="cx"> if ( ! empty( $meta['url'] ) )
</span><del>- return apply_filters( 'get_the_url', esc_url_raw( $meta['url'] ), $post );
</del><ins>+ return apply_filters( 'get_the_post_format_url', esc_url_raw( $meta['url'] ), $post );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $post->post_content ) )
</span><del>- return apply_filters( 'get_the_url', get_content_url( $post->post_content ), $post );
</del><ins>+ return apply_filters( 'get_the_post_format_url', get_content_url( $post->post_content ), $post );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -694,8 +694,8 @@
</span><span class="cx"> * @since 3.6.0
</span><span class="cx"> *.
</span><span class="cx"> */
</span><del>-function the_url() {
- echo esc_url( get_the_url() );
</del><ins>+function the_post_format_url() {
+ echo esc_url( get_the_post_format_url() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (23898 => 23899)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2013-04-04 07:53:49 UTC (rev 23898)
+++ trunk/wp-includes/query.php 2013-04-04 08:09:02 UTC (rev 23899)
</span><span class="lines">@@ -3697,17 +3697,17 @@
</span><span class="cx"> if ( $format && in_array( $format, array( 'image', 'audio', 'video' ) ) ) {
</span><span class="cx"> switch ( $format ) {
</span><span class="cx"> case 'image':
</span><del>- get_the_image( 'full', $post );
</del><ins>+ get_the_post_format_image( 'full', $post );
</ins><span class="cx"> if ( isset( $post->split_content ) )
</span><span class="cx"> $split_content = $post->split_content;
</span><span class="cx"> break;
</span><span class="cx"> case 'audio':
</span><del>- get_the_media( 'audio', $post );
</del><ins>+ get_the_post_format_media( 'audio', $post );
</ins><span class="cx"> if ( isset( $post->split_content ) )
</span><span class="cx"> $split_content = $post->split_content;
</span><span class="cx"> break;
</span><span class="cx"> case 'video':
</span><del>- get_the_media( 'video', $post );
</del><ins>+ get_the_post_format_media( 'video', $post );
</ins><span class="cx"> if ( isset( $post->split_content ) )
</span><span class="cx"> $split_content = $post->split_content;
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>