Changeset 42343 for trunk/src/wp-includes/post-formats.php

Timestamp:

11/30/2017 11:09:33 PM (9 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-includes/post-formats.php (modified) (8 diffs)

trunk/src/wp-includes/post-formats.php

@@ -16 +16 @@
  */
 function get_post_format( $post = null ) {
-        if ( ! $post = get_post( $post ) )
-                return false;
-
-        if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
-                return false;
+        if ( ! $post = get_post( $post ) ) {
+                return false;
+        }
+
+        if ( ! post_type_supports( $post->post_type, 'post-formats' ) ) {
+                return false;
+        }
 
         $_format = get_the_terms( $post->ID, 'post_format' );
 
-        if ( empty( $_format ) )
-                return false;
+        if ( empty( $_format ) ) {
+                return false;
+        }
 
         $format = reset( $_format );
 
-        return str_replace('post-format-', '', $format->slug );
+        return str_replace( 'post-format-', '', $format->slug );
 }
 
@@ -65 +68 @@
         $post = get_post( $post );
 
-        if ( empty( $post ) )
+        if ( empty( $post ) ) {
                 return new WP_Error( 'invalid_post', __( 'Invalid post.' ) );
+        }
 
         if ( ! empty( $format ) ) {
                 $format = sanitize_key( $format );
-                if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) )
+                if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) ) {
                         $format = '';
-                else
+                } else {
                         $format = 'post-format-' . $format;
+                }
         }
 
@@ -89 +94 @@
         $strings = array(
                 'standard' => _x( 'Standard', 'Post format' ), // Special case. any value that evals to false will be considered standard
-                'aside'    => _x( 'Aside',    'Post format' ),
-                'chat'     => _x( 'Chat',     'Post format' ),
-                'gallery'  => _x( 'Gallery',  'Post format' ),
-                'link'     => _x( 'Link',     'Post format' ),
-                'image'    => _x( 'Image',    'Post format' ),
-                'quote'    => _x( 'Quote',    'Post format' ),
-                'status'   => _x( 'Status',   'Post format' ),
-                'video'    => _x( 'Video',    'Post format' ),
-                'audio'    => _x( 'Audio',    'Post format' ),
+                'aside'    => _x( 'Aside', 'Post format' ),
+                'chat'     => _x( 'Chat', 'Post format' ),
+                'gallery'  => _x( 'Gallery', 'Post format' ),
+                'link'     => _x( 'Link', 'Post format' ),
+                'image'    => _x( 'Image', 'Post format' ),
+                'quote'    => _x( 'Quote', 'Post format' ),
+                'status'   => _x( 'Status', 'Post format' ),
+                'video'    => _x( 'Video', 'Post format' ),
+                'audio'    => _x( 'Audio', 'Post format' ),
         );
         return $strings;
@@ -124 +129 @@
 function get_post_format_string( $slug ) {
         $strings = get_post_format_strings();
-        if ( !$slug )
+        if ( ! $slug ) {
                 return $strings['standard'];
-        else
-                return ( isset( $strings[$slug] ) ) ? $strings[$slug] : '';
+        } else {
+                return ( isset( $strings[ $slug ] ) ) ? $strings[ $slug ] : '';
+        }
 }
 
@@ -139 +145 @@
  */
 function get_post_format_link( $format ) {
-        $term = get_term_by('slug', 'post-format-' . $format, 'post_format' );
-        if ( ! $term || is_wp_error( $term ) )
-                return false;
+        $term = get_term_by( 'slug', 'post-format-' . $format, 'post_format' );
+        if ( ! $term || is_wp_error( $term ) ) {
+                return false;
+        }
         return get_term_link( $term );
 }
@@ -155 +162 @@
  */
 function _post_format_request( $qvs ) {
-        if ( ! isset( $qvs['post_format'] ) )
+        if ( ! isset( $qvs['post_format'] ) ) {
                 return $qvs;
+        }
         $slugs = get_post_format_slugs();
-        if ( isset( $slugs[ $qvs['post_format'] ] ) )
+        if ( isset( $slugs[ $qvs['post_format'] ] ) ) {
                 $qvs['post_format'] = 'post-format-' . $slugs[ $qvs['post_format'] ];
+        }
         $tax = get_taxonomy( 'post_format' );
-        if ( ! is_admin() )
+        if ( ! is_admin() ) {
                 $qvs['post_type'] = $tax->object_type;
+        }
         return $qvs;
 }
@@ -223 +233 @@
                 if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) {
                         foreach ( $terms as $order => $name ) {
-                                $terms[$order] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
+                                $terms[ $order ] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
                         }
                 } else {
                         foreach ( (array) $terms as $order => $term ) {
                                 if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-                                        $terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+                                        $terms[ $order ]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
                                 }
                         }
@@ -248 +258 @@
         foreach ( (array) $terms as $order => $term ) {
                 if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
-                        $terms[$order]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
+                        $terms[ $order ]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
                 }
         }