Changeset 42343 for trunk/src/wp-includes/author-template.php

Timestamp:

11/30/2017 11:09:33 PM (8 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/author-template.php (modified) (16 diffs)

trunk/src/wp-includes/author-template.php

@@ -21 +21 @@
  * @return string|null The author's display name.
  */
-function get_the_author($deprecated = '') {
+function get_the_author( $deprecated = '' ) {
     global $authordata;
 
-    if ( !empty( $deprecated ) )
+    if ( ! empty( $deprecated ) ) {
         _deprecated_argument( __FUNCTION__, '2.1.0' );
+    }
 
     /**
@@ -34 +35 @@
      * @param string $authordata->display_name The author's display name.
      */
-    return apply_filters('the_author', is_object($authordata) ? $authordata->display_name : null);
+    return apply_filters( 'the_author', is_object( $authordata ) ? $authordata->display_name : null );
 }
 
@@ -62 +63 @@
 
     if ( true !== $deprecated_echo ) {
-        _deprecated_argument( __FUNCTION__, '1.5.0',
+        _deprecated_argument(
+            __FUNCTION__, '1.5.0',
             /* translators: %s: get_the_author() */
-            sprintf( __( 'Use %s instead if you do not want the value echoed.' ),
+            sprintf(
+                __( 'Use %s instead if you do not want the value echoed.' ),
                 '<code>get_the_author()</code>'
             )
@@ -85 +88 @@
  */
 function get_the_modified_author() {
-    if ( $last_id = get_post_meta( get_post()->ID, '_edit_last', true) ) {
-        $last_user = get_userdata($last_id);
+    if ( $last_id = get_post_meta( get_post()->ID, '_edit_last', true ) ) {
+        $last_user = get_userdata( $last_id );
 
         /**
@@ -95 +98 @@
          * @param string $last_user->display_name The author's display name.
          */
-        return apply_filters('the_modified_author', $last_user->display_name);
+        return apply_filters( 'the_modified_author', $last_user->display_name );
     }
 }
@@ -162 +165 @@
     }
 
-    if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ) ) )
+    if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ) ) ) {
         $field = 'user_' . $field;
+    }
 
     $value = isset( $authordata->$field ) ? $authordata->$field : '';
@@ -221 +225 @@
  */
 function get_the_author_link() {
-    if ( get_the_author_meta('url') ) {
-        return sprintf( '<a href="%1$s" title="%2$s" rel="author external">%3$s</a>',
-            esc_url( get_the_author_meta('url') ),
+    if ( get_the_author_meta( 'url' ) ) {
+        return sprintf(
+            '<a href="%1$s" title="%2$s" rel="author external">%3$s</a>',
+            esc_url( get_the_author_meta( 'url' ) ),
             /* translators: %s: author's display name */
             esc_attr( sprintf( __( 'Visit %s&#8217;s website' ), get_the_author() ) ),
@@ -289 +294 @@
     }
 
-    $link = sprintf( '<a href="%1$s" title="%2$s" rel="author">%3$s</a>',
+    $link = sprintf(
+        '<a href="%1$s" title="%2$s" rel="author">%3$s</a>',
         esc_url( get_author_posts_url( $authordata->ID, $authordata->user_nicename ) ),
         /* translators: %s: author's display name */
@@ -335 +341 @@
     global $wp_rewrite;
     $auth_ID = (int) $author_id;
-    $link = $wp_rewrite->get_author_permastruct();
-
-    if ( empty($link) ) {
+    $link    = $wp_rewrite->get_author_permastruct();
+
+    if ( empty( $link ) ) {
         $file = home_url( '/' );
         $link = $file . '?author=' . $auth_ID;
     } else {
         if ( '' == $author_nicename ) {
-            $user = get_userdata($author_id);
-            if ( !empty($user->user_nicename) )
+            $user = get_userdata( $author_id );
+            if ( ! empty( $user->user_nicename ) ) {
                 $author_nicename = $user->user_nicename;
-        }
-        $link = str_replace('%author%', $author_nicename, $link);
+            }
+        }
+        $link = str_replace( '%author%', $author_nicename, $link );
         $link = home_url( user_trailingslashit( $link ) );
     }
@@ -403 +410 @@
 
     $defaults = array(
-        'orderby' => 'name', 'order' => 'ASC', 'number' => '',
-        'optioncount' => false, 'exclude_admin' => true,
-        'show_fullname' => false, 'hide_empty' => true,
-        'feed' => '', 'feed_image' => '', 'feed_type' => '', 'echo' => true,
-        'style' => 'list', 'html' => true, 'exclude' => '', 'include' => ''
+        'orderby'       => 'name',
+        'order'         => 'ASC',
+        'number'        => '',
+        'optioncount'   => false,
+        'exclude_admin' => true,
+        'show_fullname' => false,
+        'hide_empty'    => true,
+        'feed'          => '',
+        'feed_image'    => '',
+        'feed_type'     => '',
+        'echo'          => true,
+        'style'         => 'list',
+        'html'          => true,
+        'exclude'       => '',
+        'include'       => '',
     );
 
@@ -414 +431 @@
     $return = '';
 
-    $query_args = wp_array_slice_assoc( $args, array( 'orderby', 'order', 'number', 'exclude', 'include' ) );
+    $query_args           = wp_array_slice_assoc( $args, array( 'orderby', 'order', 'number', 'exclude', 'include' ) );
     $query_args['fields'] = 'ids';
-    $authors = get_users( $query_args );
+    $authors              = get_users( $query_args );
 
     $author_count = array();
-    foreach ( (array) $wpdb->get_results( "SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE " . get_private_posts_cap_sql( 'post' ) . " GROUP BY post_author" ) as $row ) {
-        $author_count[$row->post_author] = $row->count;
+    foreach ( (array) $wpdb->get_results( "SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE " . get_private_posts_cap_sql( 'post' ) . ' GROUP BY post_author' ) as $row ) {
+        $author_count[ $row->post_author ] = $row->count;
     }
     foreach ( $authors as $author_id ) {
@@ -429 +446 @@
         }
 
-        $posts = isset( $author_count[$author->ID] ) ? $author_count[$author->ID] : 0;
+        $posts = isset( $author_count[ $author->ID ] ) ? $author_count[ $author->ID ] : 0;
 
         if ( ! $posts && $args['hide_empty'] ) {
@@ -451 +468 @@
         }
 
-        $link = sprintf( '<a href="%1$s" title="%2$s">%3$s</a>',
+        $link = sprintf(
+            '<a href="%1$s" title="%2$s">%3$s</a>',
             get_author_posts_url( $author->ID, $author->user_nicename ),
             /* translators: %s: author's display name */
@@ -468 +486 @@
             $alt = '';
             if ( ! empty( $args['feed'] ) ) {
-                $alt = ' alt="' . esc_attr( $args['feed'] ) . '"';
+                $alt  = ' alt="' . esc_attr( $args['feed'] ) . '"';
                 $name = $args['feed'];
             }
@@ -488 +506 @@
 
         if ( $args['optioncount'] ) {
-            $link .= ' ('. $posts . ')';
+            $link .= ' (' . $posts . ')';
         }
 
@@ -518 +536 @@
 
     if ( false === ( $is_multi_author = get_transient( 'is_multi_author' ) ) ) {
-        $rows = (array) $wpdb->get_col("SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 2");
+        $rows            = (array) $wpdb->get_col( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 2" );
         $is_multi_author = 1 < count( $rows ) ? 1 : 0;
         set_transient( 'is_multi_author', $is_multi_author );