Replace get_userdata() with get_authordata() for optimized user data retrieval and introduce short initialization in WP_User.

Author: spacedmonkey

src/wp-includes/author-template.php

@@ -93,7 +93,7 @@ function get_the_modified_author() {
 	$last_id = get_post_meta( get_post()->ID, '_edit_last', true );
 
 	if ( $last_id ) {
-		$last_user = get_userdata( $last_id );
+		$last_user = get_authordata( $last_id );
 
 		/**
 		 * Filters the display name of the author who last edited the current post.
@@ -164,7 +164,7 @@ function get_the_author_meta( $field = '', $user_id = false ) {
 		global $authordata;
 		$user_id = isset( $authordata->ID ) ? $authordata->ID : 0;
 	} else {
-		$authordata = get_userdata( $user_id );
+        $authordata = get_authordata( $user_id );
 	}
 
 	if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ), true ) ) {
@@ -370,7 +370,7 @@ function get_author_posts_url( $author_id, $author_nicename = '' ) {
 		$link = $file . '?author=' . $author_id;
 	} else {
 		if ( '' === $author_nicename ) {
-			$user = get_userdata( $author_id );
+			$user = get_authordata( $author_id );
 			if ( ! empty( $user->user_nicename ) ) {
 				$author_nicename = $user->user_nicename;
 			}

src/wp-includes/class-wp-query.php

@@ -4051,7 +4051,7 @@ public function get_queried_object() {
 				}
 			}
 
-			$this->queried_object = get_userdata( $this->queried_object_id );
+			$this->queried_object = get_authordata( $this->queried_object_id );
 		}
 
 		return $this->queried_object;
@@ -4887,7 +4887,7 @@ public function generate_postdata( $post ) {
 
 		$id = (int) $post->ID;
 
-		$authordata = get_userdata( $post->post_author );
+		$authordata = get_authordata( $post->post_author );
 
 		$currentday   = false;
 		$currentmonth = false;

src/wp-includes/class-wp-user.php

@@ -112,6 +112,9 @@ class WP_User {
 	 */
 	private static $back_compat_keys;
 
+
+	private $short_init = false;
+
 	/**
 	 * Constructor.
 	 *
@@ -174,14 +177,17 @@ public function __construct( $id = 0, $name = '', $site_id = 0 ) {
 	 *
 	 * @param object $data    User DB row object.
 	 * @param int    $site_id Optional. The site ID to initialize for.
+	 * @param bool   $short_init Optional. Whether to skip initializing capabilities and roles.
 	 */
-	public function init( $data, $site_id = 0 ) {
+	public function init( $data, $site_id = 0, $short_init = false ) {
 		if ( ! isset( $data->ID ) ) {
 			$data->ID = 0;
 		}
 		$this->data = $data;
 		$this->ID   = (int) $data->ID;
 
+		$this->short_init = $short_init;
+
 		$this->for_site( $site_id );
 	}
 
@@ -548,6 +554,7 @@ public function add_role( $role ) {
 		if ( empty( $role ) ) {
 			return;
 		}
+		$this->load_capability_data();
 
 		if ( in_array( $role, $this->roles, true ) ) {
 			return;
@@ -577,6 +584,7 @@ public function add_role( $role ) {
 	 * @param string $role Role name.
 	 */
 	public function remove_role( $role ) {
+		$this->load_capability_data();
 		if ( ! in_array( $role, $this->roles, true ) ) {
 			return;
 		}
@@ -609,6 +617,7 @@ public function remove_role( $role ) {
 	 * @param string $role Role name.
 	 */
 	public function set_role( $role ) {
+		$this->load_capability_data();
 		if ( 1 === count( $this->roles ) && current( $this->roles ) === $role ) {
 			return;
 		}
@@ -710,6 +719,7 @@ public function update_user_level_from_caps() {
 	 * @param bool   $grant Whether to grant capability to user.
 	 */
 	public function add_cap( $cap, $grant = true ) {
+		$this->load_capability_data();
 		$this->caps[ $cap ] = $grant;
 		update_user_meta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
@@ -724,6 +734,7 @@ public function add_cap( $cap, $grant = true ) {
 	 * @param string $cap Capability name.
 	 */
 	public function remove_cap( $cap ) {
+		$this->load_capability_data();
 		if ( ! isset( $this->caps[ $cap ] ) ) {
 			return;
 		}
@@ -776,6 +787,7 @@ public function remove_all_caps() {
 	 *              the given capability for that object.
 	 */
 	public function has_cap( $cap, ...$args ) {
+		$this->load_capability_data();
 		if ( is_numeric( $cap ) ) {
 			_deprecated_argument( __FUNCTION__, '2.0.0', __( 'Usage of user levels is deprecated. Use capabilities instead.' ) );
 			$cap = $this->translate_level_to_cap( $cap );
@@ -878,6 +890,10 @@ public function for_site( $site_id = 0 ) {
 
 		$this->cap_key = $wpdb->get_blog_prefix( $this->site_id ) . 'capabilities';
 
+		if ( $this->short_init ) {
+			return;
+		}
+
 		$this->caps = $this->get_caps_data();
 
 		$this->get_role_caps();
@@ -911,4 +927,18 @@ private function get_caps_data() {
 
 		return $caps;
 	}
+
+	/**
+	 * Loads capability data if it has not been loaded yet.
+	 *
+	 * @since 6.9.0
+	 */
+	private function load_capability_data() {
+		if ( ! $this->short_init ) {
+			return;
+		}
+		$this->caps = $this->get_caps_data();
+		$this->get_role_caps();
+		$this->short_init = false;
+	}
 }

src/wp-includes/class-wp.php

@@ -675,7 +675,7 @@ public function register_globals() {
 		}
 
 		if ( $wp_query->is_author() ) {
-			$GLOBALS['authordata'] = get_userdata( get_queried_object_id() );
+			$GLOBALS['authordata'] = get_authordata( get_queried_object_id() );
 		}
 	}
 

src/wp-includes/user.php

@@ -1974,6 +1974,25 @@ function sanitize_user_field( $field, $value, $user_id, $context ) {
 	return $value;
 }
 
+/**
+ * Retrieves user info by user ID. Set short init to only load User data not capabilities / roles
+ *
+ * @since 6.9.0
+ *
+ * @param int $user_id User ID
+ * @return WP_User|false WP_User object on success, false on failure.
+ */
+function get_authordata( $user_id ) {
+	$userdata = WP_User::get_data_by( 'id', $user_id );
+	if ( ! $userdata ) {
+		return false;
+	}
+
+	$user = new WP_User();
+	$user->init( $userdata, 0, true );
+	return $user;
+}
+
 /**
  * Updates all user caches.
  *