Ticket #20372: 20372.2.diff

wp-comments-post.php

@@ -54 +54 @@
 
 // If the user is logged in
 $user = wp_get_current_user();
-if ( $user->ID ) {
+if ( $user->exists() ) {
         if ( empty( $user->display_name ) )
                 $user->display_name=$user->user_login;
         $comment_author       = $wpdb->escape($user->display_name);
@@ -73 +73 @@
 
 $comment_type = '';
 
-if ( get_option('require_name_email') && !$user->ID ) {
+if ( get_option('require_name_email') && !$user->exists() ) {
         if ( 6 > strlen($comment_author_email) || '' == $comment_author )
                 wp_die( __('<strong>ERROR</strong>: please fill the required fields (name, email).') );
         elseif ( !is_email($comment_author_email))

wp-includes/comment.php

@@ -579 +579 @@
  * @since 3.4.0
  */
 function wp_set_comment_cookies($comment, $user) {
-        if ( $user->ID )
+        if ( $user->exists() )
                 return;
 
         $comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);

wp-includes/comment-template.php

@@ -1517 +1517 @@
 
         $commenter = wp_get_current_commenter();
         $user = wp_get_current_user();
-        $user_identity = ! empty( $user->ID ) ? $user->display_name : '';
+        $user_identity = $user->exists() ? $user->display_name : '';
 
         $req = get_option( 'require_name_email' );
         $aria_req = ( $req ? " aria-required='true'" : '' );

wp-includes/user.php

@@ -259 +259 @@
         else
                 $user = new WP_User( $user );
 
-        if ( ! isset( $user->ID ) )
+        if ( ! $user->exists() )
                 return false;
 
         if ( $user->has_prop( $wpdb->prefix . $option ) ) // Blog specific
@@ -940 +940 @@
         $user_ID    = (int) $user->ID;
         $user_level = (int) isset($user->user_level) ? $user->user_level : 0;
 
-        if ( 0 == $user->ID ) {
+        if ( ! $user->exists() ) {
                 $user_login = $user_email = $user_url = $user_pass_md5 = $user_identity = '';
                 return;
         }

wp-includes/ms-deprecated.php

@@ -49 +49 @@
                         return false;
         } else {
                 $user = get_user_by( 'login', $user_login );
-                if ( empty( $user->ID ) )
+                if ( ! $user->exists() )
                         return false;
                 $user_id = $user->ID;
         }

wp-includes/capabilities.php

@@ -599 +599 @@
         }
 
         /**
+         * Determine whether the user exists in the database.
+         *
+         * @since 3.4.0
+         * @access public
+         *
+         * @return bool True if user exists in the database, false if not.
+         */
+        function exists() {
+                return ! empty( $this->ID );
+        }
+
+        /**
          * Retrieve the value of a property or meta key.
          *
          * Retrieves from the users and usermeta table.
@@ -1259 +1271 @@
         if ( ! is_object( $user ) )
                 $user = new WP_User( $user );
 
-        if ( ! $user || ! $user->ID )
+        if ( ! $user || ! $user->exists() )
                 return false;
 
         $args = array_slice( func_get_args(), 2 );
@@ -1356 +1368 @@
         else
                 $user = wp_get_current_user();
 
-        if ( empty( $user->ID ) )
+        if ( ! $user->exists() )
                 return false;
 
         if ( is_multisite() ) {

wp-includes/pluggable.php

@@ -709 +709 @@
 function is_user_logged_in() {
         $user = wp_get_current_user();
 
-        if ( empty( $user->ID ) )
+        if ( ! $user->exists() )
                 return false;
 
         return true;

wp-includes/ms-functions.php

@@ -185 +185 @@
 
         $user = new WP_User($user_id);
 
-        if ( empty( $user->ID ) ) {
+        if ( ! $user->exists() ) {
                 restore_current_blog();
                 return new WP_Error('user_does_not_exist', __('That user does not exist.'));
         }
@@ -247 +247 @@
 
         // wp_revoke_user($user_id);
         $user = new WP_User($user_id);
-        if ( empty( $user->ID ) ) {
+        if ( ! $user->exists() ) {
                 restore_current_blog();
                 return new WP_Error('user_does_not_exist', __('That user does not exist.'));
         }

wp-admin/includes/ajax-actions.php

@@ -742 +742 @@
                 wp_die( __('ERROR: you are replying to a comment on a draft post.') );
 
         $user = wp_get_current_user();
-        if ( $user->ID ) {
+        if ( $user->exists() ) {
                 $user_ID = $user->ID;
                 $comment_author       = $wpdb->escape($user->display_name);
                 $comment_author_email = $wpdb->escape($user->user_email);