Changeset 23899

Timestamp:

04/04/2013 08:09:02 AM (12 years ago)

Author:

markjaquith

Message:

Standardize the post format theme API functions with the_post_format_THING() and get_the_post_format_THING().

fixes #23927

Location:

trunk

Files:

• wp-content/themes/twentyeleven/functions.php (modified) (1 diff)
• wp-content/themes/twentythirteen/content-audio.php (modified) (1 diff)
• wp-content/themes/twentythirteen/content-chat.php (modified) (1 diff)
• wp-content/themes/twentythirteen/content-video.php (modified) (1 diff)
• wp-content/themes/twentythirteen/functions.php (modified) (1 diff)
• wp-includes/media.php (modified) (5 diffs)
• wp-includes/post-formats.php (modified) (5 diffs)
• wp-includes/query.php (modified) (1 diff)

trunk/wp-content/themes/twentyeleven/functions.php

@@ -466 +466 @@
  */
 function twentyeleven_get_first_url() {
-    $has_url = function_exists( 'get_the_url' ) ? get_the_url() : false;
+    $has_url = function_exists( 'get_the_post_format_url' ) ? get_the_post_format_url() : false;
 
     if ( ! $has_url )

trunk/wp-content/themes/twentythirteen/content-audio.php

@@ -22 +22 @@
     <div class="entry-media">
         <div class="audio-content">
-            <?php the_audio(); ?>
+            <?php the_post_format_audio(); ?>
         </div><!-- .audio-content -->
     </div><!-- .entry-media -->

trunk/wp-content/themes/twentythirteen/content-chat.php

@@ -21 +21 @@
 
     <div class="entry-content">
-        <?php the_chat(); ?>
+        <?php the_post_format_chat(); ?>
         <?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>' ) ); ?>
     </div><!-- .entry-content -->

trunk/wp-content/themes/twentythirteen/content-video.php

@@ -11 +11 @@
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
     <div class="entry-media">
-        <?php the_video(); ?>
+        <?php the_post_format_video(); ?>
     </div><!-- .entry-media -->
 

trunk/wp-content/themes/twentythirteen/functions.php

@@ -441 +441 @@
  */
 function twentythirteen_get_link_url() {
-    $has_url = get_the_url();
+    $has_url = get_the_post_format_url();
 
     return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );

trunk/wp-includes/media.php

@@ -2032 +2032 @@
  * @return string
  */
-function get_the_media( $type, &$post = null ) {
+function get_the_post_format_media( $type, &$post = null ) {
     global $wp_embed;
 
@@ -2119 +2119 @@
  *
  */
-function the_video() {
-    echo get_the_media( 'video' );
+function the_post_format_video() {
+    echo get_the_post_format_media( 'video' );
 }
 /**
@@ -2128 +2128 @@
  *
  */
-function the_audio() {
-    echo get_the_media( 'audio' );
+function the_post_format_audio() {
+    echo get_the_post_format_media( 'audio' );
 }
 
@@ -2361 +2361 @@
  * @param WP_Post $post Optional. Used instead of global $post when passed.
  */
-function get_the_image( $attached_size = 'full', &$post = null ) {
+function get_the_post_format_image( $attached_size = 'full', &$post = null ) {
     if ( empty( $post ) )
         $post = get_post();
@@ -2436 +2436 @@
  * @param string $attached_size If an attached image is found, the size to display it.
  */
-function the_image( $attached_size = 'full' ) {
-    echo get_the_image( $attached_size );
-}
+function the_post_format_image( $attached_size = 'full' ) {
+    echo get_the_post_format_image( $attached_size );
+}

trunk/wp-includes/post-formats.php

@@ -575 +575 @@
  * @return array
  */
-function get_the_chat( $id = 0 ) {
+function get_the_post_format_chat( $id = 0 ) {
     $post = empty( $id ) ? clone get_post() : get_post( $id );
     if ( empty( $post ) )
@@ -593 +593 @@
  * @since 3.6.0
  *
- * @uses get_the_chat()
+ * @uses get_the_post_format_chat()
  *
  * @print HTML
  */
-function the_chat() {
+function the_post_format_chat() {
     $output  = '<dl class="chat">';
-    $stanzas = get_the_chat();
+    $stanzas = get_the_post_format_chat();
 
     foreach ( $stanzas as $stanza ) {
@@ -674 +674 @@
  * @return string A URL, if found.
  */
-function get_the_url( $id = 0 ) {
+function get_the_post_format_url( $id = 0 ) {
     $post = empty( $id ) ? get_post() : get_post( $id );
     if ( empty( $post ) )
@@ -682 +682 @@
         $meta = get_post_format_meta( $post->ID );
         if ( ! empty( $meta['url'] ) )
-            return apply_filters( 'get_the_url', esc_url_raw( $meta['url'] ), $post );
+            return apply_filters( 'get_the_post_format_url', esc_url_raw( $meta['url'] ), $post );
     }
 
     if ( ! empty( $post->post_content ) )
-        return apply_filters( 'get_the_url', get_content_url( $post->post_content ), $post );
+        return apply_filters( 'get_the_post_format_url', get_content_url( $post->post_content ), $post );
 }
 
@@ -695 +695 @@
  *.
  */
-function the_url() {
-    echo esc_url( get_the_url() );
+function the_post_format_url() {
+    echo esc_url( get_the_post_format_url() );
 }
 

trunk/wp-includes/query.php

@@ -3698 +3698 @@
         switch ( $format ) {
         case 'image':
-            get_the_image( 'full', $post );
+            get_the_post_format_image( 'full', $post );
             if ( isset( $post->split_content ) )
                 $split_content = $post->split_content;
             break;
         case 'audio':
-            get_the_media( 'audio', $post );
+            get_the_post_format_media( 'audio', $post );
             if ( isset( $post->split_content ) )
                 $split_content = $post->split_content;
             break;
         case 'video':
-            get_the_media( 'video', $post );
+            get_the_post_format_media( 'video', $post );
             if ( isset( $post->split_content ) )
                 $split_content = $post->split_content;