Ticket #21120: 21120.3.diff

wordpress/wp-includes/capabilities.php

@@ -1381 +1381 @@
  */
 function is_super_admin( $user_id = false ) {
         if ( $user_id )
-                $user = new WP_User( $user_id );
+                $user = get_userdata( $user_id );
         else
                 $user = wp_get_current_user();
 

wordpress/wp-includes/pluggable.php

@@ -114 +114 @@
  *
  * @since 0.71
  *
- * @param int $user_id User ID
+ * @param int $user_id User ID.
  * @return bool|object False on failure, WP_User object on success
  */
 function get_userdata( $user_id ) {
@@ -133 +133 @@
  * @return bool|object False on failure, WP_User object on success
  */
 function get_user_by( $field, $value ) {
+        if ( 'id' === $field && $value && get_current_user_id() === $value )
+                return wp_get_current_user();
+
         $userdata = WP_User::get_data_by( $field, $value );
 
         if ( !$userdata )