Ticket #15458: 15458.diff

wp-includes/capabilities.php

@@ -360 +360 @@
         /**
          * User data container.
          *
-         * This will be set as properties of the object.
-         *
          * @since 2.0.0
          * @access private
          * @var array
@@ -378 +376 @@
         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;
-
-        /**
          * The individual capabilities the user has been given.
          *
          * @since 2.0.0
@@ -471 +458 @@
          * @return WP_User
          */
         function __construct( $id, $name = '', $blog_id = '' ) {
-
                 if ( empty( $id ) && empty( $name ) )
                         return;
 
@@ -488 +474 @@
                 if ( empty( $this->data->ID ) )
                         return;
 
-                foreach ( get_object_vars( $this->data ) as $key => $value ) {
-                        $this->{$key} = $value;
+                $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;
                 }
 
-                $this->id = $this->ID;
-                $this->for_blog( $blog_id );
+                return $this->data->$key;
         }
 
         /**
+         * Magic method for setting custom fields
+         *
+         * @since 3.3.0
+         */
+        function __set( $key, $value ) {
+                $this->data->$key = $value;
+        }
+
+        /**
          * Set up capability object properties.
          *
          * Will set the value for the 'cap_key' property to current database table
@@ -511 +525 @@
          */
         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();
         }
 
@@ -956 +973 @@
         case 'add_post_meta':
                 $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 ); 
+                $caps = map_meta_cap( $post_type_object->cap->edit_post, $user_id, $post->ID );
 
-                $meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false; 
-                        
+                $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 );
                         if ( ! $allowed )