Ticket #21120: 21120.2.diff

wp-includes/capabilities.php

@@ -1380 +1380 @@
  * @return bool True if the user is a site admin.
  */
 function is_super_admin( $user_id = false ) {
-        if ( $user_id )
+        if ( $user_id && $user_id != get_current_user_id() )
                 $user = new WP_User( $user_id );
         else
                 $user = wp_get_current_user();

wp-includes/pluggable.php

@@ -133 +133 @@
  * @return bool|object False on failure, WP_User object on success
  */
 function get_user_by( $field, $value ) {
+        if ( 'id' === $field && get_current_user_id() == $value )
+                return wp_get_current_user();
+
         $userdata = WP_User::get_data_by( $field, $value );
 
         if ( !$userdata )