Changeset 30864

Timestamp:

12/15/2014 03:58:35 PM (12 years ago)

Author:

johnbillion

Message:

Avoid repeatedly calling is_tax( 'post_format', '...' ) in get_the_archive_title().

Merges [30854] to the 4.1 branch.

See #21995.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• src/wp-includes/general-template.php (modified) (3 diffs)

branches/4.1/src/wp-includes/general-template.php

@@ -1152 +1152 @@
         } elseif ( is_day() ) {
                 $title = sprintf( __( 'Day: %s' ), get_the_date( _x( 'F j, Y', 'daily archives date format' ) ) );
-        } elseif ( is_tax( 'post_format', 'post-format-aside' ) ) {
-                $title = _x( 'Asides', 'post format archive title' );
-        } elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) {
-                $title = _x( 'Galleries', 'post format archive title' );
-        } elseif ( is_tax( 'post_format', 'post-format-image' ) ) {
-                $title = _x( 'Images', 'post format archive title' );
-        } elseif ( is_tax( 'post_format', 'post-format-video' ) ) {
-                $title = _x( 'Videos', 'post format archive title' );
-        } elseif ( is_tax( 'post_format', 'post-format-quote' ) ) {
-                $title = _x( 'Quotes', 'post format archive title' );
-        } elseif ( is_tax( 'post_format', 'post-format-link' ) ) {
-                $title = _x( 'Links', 'post format archive title' );
-        } elseif ( is_tax( 'post_format', 'post-format-status' ) ) {
-                $title = _x( 'Statuses', 'post format archive title' );
-        } elseif ( is_tax( 'post_format', 'post-format-audio' ) ) {
-                $title = _x( 'Audio', 'post format archive title' );
-        } elseif ( is_tax( 'post_format', 'post-format-chat' ) ) {
-                $title = _x( 'Chats', 'post format archive title' );
+        } elseif ( is_tax( 'post_format' ) ) {
+                if ( is_tax( 'post_format', 'post-format-aside' ) ) {
+                        $title = _x( 'Asides', 'post format archive title' );
+                } elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) {
+                        $title = _x( 'Galleries', 'post format archive title' );
+                } elseif ( is_tax( 'post_format', 'post-format-image' ) ) {
+                        $title = _x( 'Images', 'post format archive title' );
+                } elseif ( is_tax( 'post_format', 'post-format-video' ) ) {
+                        $title = _x( 'Videos', 'post format archive title' );
+                } elseif ( is_tax( 'post_format', 'post-format-quote' ) ) {
+                        $title = _x( 'Quotes', 'post format archive title' );
+                } elseif ( is_tax( 'post_format', 'post-format-link' ) ) {
+                        $title = _x( 'Links', 'post format archive title' );
+                } elseif ( is_tax( 'post_format', 'post-format-status' ) ) {
+                        $title = _x( 'Statuses', 'post format archive title' );
+                } elseif ( is_tax( 'post_format', 'post-format-audio' ) ) {
+                        $title = _x( 'Audio', 'post format archive title' );
+                } elseif ( is_tax( 'post_format', 'post-format-chat' ) ) {
+                        $title = _x( 'Chats', 'post format archive title' );
+                }
         } elseif ( is_post_type_archive() ) {
                 $title = sprintf( __( 'Archives: %s' ), post_type_archive_title( '', false ) );
@@ -1202 +1204 @@
 function the_archive_description( $before = '', $after = '' ) {
         $description = get_the_archive_description();
-
-        if ( ! empty( $description ) ) {
+        if ( $description ) {
                 echo $before . $description . $after;
         }
@@ -1216 +1217 @@
  */
 function get_the_archive_description() {
-
         /**
          * Filter the archive description.