Changeset 21563

Timestamp:

08/20/2012 09:58:34 PM (13 years ago)

Author:

nacin

Message:

Move the optimization done to get_user_by() in [21376] higher up the stack, into map_meta_cap() and is_super_admin().

This provides nearly the same benefits without possibly receiving a stale object from get_userdata(),
which could affect authentication, and introduce side effects for plugins.

see #21120.

Location:

trunk/wp-includes

Files:

• capabilities.php (modified) (4 diffs)
• pluggable.php (modified) (1 diff)

trunk/wp-includes/capabilities.php

@@ -1017 +1017 @@
         }
 
-        if ( '' != $post->post_author ) {
-            $post_author_data = get_userdata( $post->post_author );
-        } else {
-            // No author set yet, so default to current user for cap checks.
-            $post_author_data = get_userdata( $user_id );
-        }
+        $post_author_id = $post->post_author;
+
+        // If no author set yet, default to current user for cap checks.
+        if ( ! $post_author_id )
+            $post_author_id = $user_id;
+
+        $post_author_data = $post_author_id == get_current_user_id() ? wp_get_current_user() : get_userdata( $post_author_id );
 
         // If the user is the author...
@@ -1066 +1067 @@
         }
 
-        if ( '' != $post->post_author ) {
-            $post_author_data = get_userdata( $post->post_author );
-        } else {
-            // No author set yet, so default to current user for cap checks.
-            $post_author_data = get_userdata( $user_id );
-        }
-
-        //echo "current user id : $user_id, post author id: " . $post_author_data->ID . "<br />";
+        $post_author_id = $post->post_author;
+
+        // If no author set yet, default to current user for cap checks.
+        if ( ! $post_author_id )
+            $post_author_id = $user_id;
+
+        $post_author_data = $post_author_id == get_current_user_id() ? wp_get_current_user() : get_userdata( $post_author_id );
+
         // If the user is the author...
         if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID ) {
@@ -1120 +1121 @@
         }
 
-        if ( '' != $post->post_author ) {
-            $post_author_data = get_userdata( $post->post_author );
-        } else {
-            // No author set yet, so default to current user for cap checks.
-            $post_author_data = get_userdata( $user_id );
-        }
+        $post_author_id = $post->post_author;
+
+        // If no author set yet, default to current user for cap checks.
+        if ( ! $post_author_id )
+            $post_author_id = $user_id;
+
+        $post_author_data = $post_author_id == get_current_user_id() ? wp_get_current_user() : get_userdata( $post_author_id );
 
         if ( is_object( $post_author_data ) && $user_id == $post_author_data->ID )
@@ -1424 +1426 @@
  */
 function is_super_admin( $user_id = false ) {
-    if ( ! $user_id )
-        $user_id = get_current_user_id();
-
-    if ( ! $user = get_userdata( $user_id ) )
+    if ( ! $user_id || $user_id == get_current_user_id() )
+        $user = wp_get_current_user();
+    else
+        $user = get_userdata( $user_id );
+
+    if ( ! $user || ! $user->exists() )
         return false;
 

trunk/wp-includes/pluggable.php

@@ -134 +134 @@
  */
 function get_user_by( $field, $value ) {
-    if ( 'id' === $field && (int) $value && get_current_user_id() === (int) $value )
-        return wp_get_current_user();
-
     $userdata = WP_User::get_data_by( $field, $value );