Changeset 20565

Timestamp:

04/23/2012 09:34:07 PM (12 years ago)

Author:

ryan

Message:

Remove key mangling code from get_the_author_meta(). Make it more inline with get_user_option(). Handle collision with old users table columns that are on old schema, particularly user_description.

Props scribu, fredwu.
Fixes #20285

File:

• trunk/wp-includes/author-template.php (modified) (1 diff)

trunk/wp-includes/author-template.php

@@ -97 +97 @@
  * @return string The author's field from the current author's DB object.
  */
-function get_the_author_meta($field = '', $user_id = false) {
-    if ( ! $user_id )
+function get_the_author_meta( $field = '', $user_id = false ) {
+    if ( ! $user_id ) {
         global $authordata;
-    else
+        $user_id = $authordata->ID;
+    } else {
         $authordata = get_userdata( $user_id );
-
-    // Keys used as object vars cannot have dashes.
-    $field = str_replace('-', '', $field);
-    $field = strtolower($field);
-    $user_field = "user_$field";
-
-    if ( 'id' == $field )
-        $value = isset($authordata->ID) ? (int)$authordata->ID : 0;
-    elseif ( isset($authordata->$user_field) )
-        $value = $authordata->$user_field;
-    else
-        $value = isset($authordata->$field) ? $authordata->$field : '';
-
-    return apply_filters('get_the_author_' . $field, $value, $user_id);
+    }
+
+    if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ) ) )
+        $field = 'user_' . $field;
+
+    $value = isset( $authordata->$field ) ? $authordata->$field : '';
+
+    return apply_filters( 'get_the_author_' . $field, $value, $user_id );
 }