Changeset 20378

Timestamp:

04/06/2012 07:18:45 PM (13 years ago)

Author:

ryan

Message:

Introduce WP_User::exists(). see #20372

Location:

trunk

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-comments-post.php (modified) (2 diffs)
• wp-includes/capabilities.php (modified) (3 diffs)
• wp-includes/comment-template.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/ms-deprecated.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (2 diffs)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)

trunk/wp-admin/includes/ajax-actions.php

@@ -743 +743 @@
 
     $user = wp_get_current_user();
-    if ( $user->ID ) {
+    if ( $user->exists() ) {
         $user_ID = $user->ID;
         $comment_author       = $wpdb->escape($user->display_name);

trunk/wp-comments-post.php

@@ -55 +55 @@
 // 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;
@@ -74 +74 @@
 $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).') );

trunk/wp-includes/capabilities.php

@@ -597 +597 @@
 
         $this->data->$key = $value;
+    }
+
+    /**
+     * 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 );
     }
 
@@ -1260 +1272 @@
         $user = new WP_User( $user );
 
-    if ( ! $user || ! $user->ID )
+    if ( ! $user || ! $user->exists() )
         return false;
 
@@ -1357 +1369 @@
         $user = wp_get_current_user();
 
-    if ( empty( $user->ID ) )
+    if ( ! $user->exists() )
         return false;
 

trunk/wp-includes/comment-template.php

@@ -1518 +1518 @@
     $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' );

trunk/wp-includes/comment.php

@@ -580 +580 @@
  */
 function wp_set_comment_cookies($comment, $user) {
-    if ( $user->ID )
+    if ( $user->exists() )
         return;
 

trunk/wp-includes/ms-deprecated.php

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

trunk/wp-includes/ms-functions.php

@@ -186 +186 @@
     $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.'));
@@ -248 +248 @@
     // 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.'));

trunk/wp-includes/pluggable.php

@@ -710 +710 @@
     $user = wp_get_current_user();
 
-    if ( empty( $user->ID ) )
+    if ( ! $user->exists() )
         return false;
 

trunk/wp-includes/user.php

@@ -260 +260 @@
         $user = new WP_User( $user );
 
-    if ( ! isset( $user->ID ) )
+    if ( ! $user->exists() )
         return false;
 
@@ -941 +941 @@
     $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;