Changeset 18504 for trunk/wp-includes/capabilities.php

Timestamp:

08/04/2011 03:09:27 AM (14 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

File:

• trunk/wp-includes/capabilities.php (modified) (8 diffs)

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;