Changeset 18504

Timestamp:

08/04/2011 03:09:27 AM (13 years ago)

Author:

ryan

Message:

Add magic get/set/isset methods to WP_User to avoid data duplication. Standardize on WP_User::ID. Props scribu. see #15458

Location:

trunk

Files:

• wp-admin/includes/deprecated.php (modified) (1 diff)
• wp-admin/includes/ms.php (modified) (1 diff)
• wp-admin/my-sites.php (modified) (2 diffs)
• wp-admin/users.php (modified) (2 diffs)
• wp-includes/capabilities.php (modified) (8 diffs)
• wp-includes/pluggable.php (modified) (3 diffs)
• wp-includes/user.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)
• wp-signup.php (modified) (1 diff)

trunk/wp-admin/includes/deprecated.php

@@ -256 +256 @@
     if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
         if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
-            return array($user->id);
+            return array($user->ID);
         else
             return array();

trunk/wp-admin/includes/ms.php

@@ -251 +251 @@
         $errors = new WP_Error();
 
-    if ( $current_user->id != $_POST['user_id'] )
+    if ( $current_user->ID != $_POST['user_id'] )
         return false;
 

trunk/wp-admin/my-sites.php

@@ -18 +18 @@
 $action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
 
-$blogs = get_blogs_of_user( $current_user->id );
+$blogs = get_blogs_of_user( $current_user->ID );
 
 if ( empty( $blogs ) )
@@ -29 +29 @@
     $blog = get_blog_details( (int) $_POST['primary_blog'] );
     if ( $blog && isset( $blog->domain ) ) {
-        update_user_option( $current_user->id, 'primary_blog', (int) $_POST['primary_blog'], true );
+        update_user_option( $current_user->ID, 'primary_blog', (int) $_POST['primary_blog'], true );
         $updated = true;
     } else {

trunk/wp-admin/users.php

@@ -217 +217 @@
     foreach ( $userids as $id ) {
         $id = (int) $id;
-        if ( $id == $current_user->id && !is_super_admin() ) {
+        if ( $id == $current_user->ID && !is_super_admin() ) {
             $update = 'err_admin_remove';
             continue;
@@ -270 +270 @@
         $id = (int) $id;
         $user = new WP_User($id);
-        if ( $id == $current_user->id && !is_super_admin() ) {
+        if ( $id == $current_user->ID && !is_super_admin() ) {
             echo "<li>" . sprintf(__('ID #%1s: %2s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
         } elseif ( !current_user_can('remove_user', $id) ) {

trunk/wp-includes/capabilities.php

@@ -361 +361 @@
      * User data container.
      *
-     * This will be set as properties of the object.
-     *
      * @since 2.0.0
      * @access private
@@ -377 +375 @@
      */
     var $ID = 0;
-
-    /**
-     * The deprecated user's ID.
-     *
-     * @since 2.0.0
-     * @access public
-     * @deprecated Use WP_User::$ID
-     * @see WP_User::$ID
-     * @var int
-     */
-    var $id = 0;
 
     /**
@@ -472 +459 @@
      */
     function __construct( $id, $name = '', $blog_id = '' ) {
-
         if ( empty( $id ) && empty( $name ) )
             return;
@@ -489 +475 @@
             return;
 
-        foreach ( get_object_vars( $this->data ) as $key => $value ) {
-            $this->{$key} = $value;
-        }
-
-        $this->id = $this->ID;
+        $this->ID = $this->data->ID;
         $this->for_blog( $blog_id );
+    }
+
+    /**
+     * Magic method for checking the existance of a certain custom field
+     *
+     * @since 3.3.0
+     */
+    function __isset( $key ) {
+        return isset( $this->data->$key );
+    }
+
+    /**
+     * Magic method for accessing custom fields
+     *
+     * @since 3.3.0
+     */
+    function __get( $key ) {
+        if ( 'id' == $key ) {
+            _deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
+            return $this->ID;
+        }
+
+        return $this->data->$key;
+    }
+
+    /**
+     * Magic method for setting custom fields
+     *
+     * @since 3.3.0
+     */
+    function __set( $key, $value ) {
+        $this->data->$key = $value;
     }
 
@@ -512 +526 @@
     function _init_caps( $cap_key = '' ) {
         global $wpdb;
+
         if ( empty($cap_key) )
             $this->cap_key = $wpdb->prefix . 'capabilities';
         else
             $this->cap_key = $cap_key;
-        $this->caps = &$this->{$this->cap_key};
+
+        $this->caps = &$this->data->{$this->cap_key};
         if ( ! is_array( $this->caps ) )
             $this->caps = array();
+
         $this->get_role_caps();
     }
@@ -957 +974 @@
         $post = get_post( $args[0] );
         $post_type_object = get_post_type_object( $post->post_type );
-        $caps = map_meta_cap( $post_type_object->cap->edit_post, $user_id, $post->ID ); 
-
-        $meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false; 
-            
+        $caps = map_meta_cap( $post_type_object->cap->edit_post, $user_id, $post->ID );
+
+        $meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
+
         if ( $meta_key && has_filter( "auth_post_meta_{$meta_key}" ) ) {
             $allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
@@ -1081 +1098 @@
 
     // Create new object to avoid stomping the global current_user.
-    $user = new WP_User( $current_user->id) ;
+    $user = new WP_User( $current_user->ID) ;
 
     // Set the blog id.  @todo add blog id arg to WP_User constructor?
@@ -1226 +1243 @@
         $user = wp_get_current_user();
 
-    if ( empty( $user->id ) )
+    if ( empty( $user->ID ) )
         return false;
 

trunk/wp-includes/pluggable.php

@@ -784 +784 @@
     $user = wp_get_current_user();
 
-    if ( $user->id == 0 )
+    if ( $user->ID == 0 )
         return false;
 
@@ -1309 +1309 @@
 function wp_verify_nonce($nonce, $action = -1) {
     $user = wp_get_current_user();
-    $uid = (int) $user->id;
+    $uid = (int) $user->ID;
 
     $i = wp_nonce_tick();
@@ -1335 +1335 @@
 function wp_create_nonce($action = -1) {
     $user = wp_get_current_user();
-    $uid = (int) $user->id;
+    $uid = (int) $user->ID;
 
     $i = wp_nonce_tick();

trunk/wp-includes/user.php

@@ -1567 +1567 @@
     // Update the cookies if the password changed.
     $current_user = wp_get_current_user();
-    if ( $current_user->id == $ID ) {
+    if ( $current_user->ID == $ID ) {
         if ( isset($plaintext_pass) ) {
             wp_clear_auth_cookie();

trunk/wp-login.php

@@ -587 +587 @@
         if ( ( empty( $redirect_to ) || $redirect_to == 'wp-admin/' || $redirect_to == admin_url() ) ) {
             // If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
-            if ( is_multisite() && !get_active_blog_for_user($user->id) && !is_super_admin( $user->id ) )
+            if ( is_multisite() && !get_active_blog_for_user($user->ID) && !is_super_admin( $user->ID ) )
                 $redirect_to = user_admin_url();
             elseif ( is_multisite() && !$user->has_cap('read') )
-                $redirect_to = get_dashboard_url( $user->id );
+                $redirect_to = get_dashboard_url( $user->ID );
             elseif ( !$user->has_cap('edit_posts') )
                 $redirect_to = admin_url('profile.php');

trunk/wp-signup.php

@@ -214 +214 @@
     $meta = apply_filters( 'add_signup_meta', $meta );
 
-    wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
+    wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid );
     confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
     return true;