From b6f44dc5325d9a1d4c996e4c5af32ae35ec364b0 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 16 Nov 2005 02:54:23 +0000
Subject: [PATCH] Pull the values in WP_User::data directly into WP_User so
 that we don't have to do ->data->blah.

git-svn-id: http://svn.automattic.com/wordpress/trunk@3102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/profile.php                | 41 ++++++++++++++---------------
 wp-admin/user-edit.php              | 41 ++++++++++++++---------------
 wp-admin/users.php                  | 23 ++++++++--------
 wp-includes/capabilities.php        | 12 ++++++---
 wp-includes/functions.php           |  8 +++---
 wp-includes/pluggable-functions.php |  4 +--
 6 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index 5c43ab55e..ad586598b 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -6,7 +6,6 @@ $title = 'Profile';
 $parent_file = 'profile.php';
 include_once('admin-header.php');
 $profileuser = new WP_User($user_ID);
-$profiledata = &$profileuser->data;
 
 $bookmarklet_height= 440;
 ?>
@@ -28,32 +27,32 @@ $bookmarklet_height= 440;
 <fieldset>
 <legend><?php _e('Name'); ?></legend>
 <p><label><?php _e('Username: (no editing)'); ?><br />
-<input type="text" name="user_login" value="<?php echo $profiledata->user_login; ?>" disabled="disabled" />
+<input type="text" name="user_login" value="<?php echo $profileuser->user_login; ?>" disabled="disabled" />
 </label></p>
 
 <p><label><?php _e('First name:') ?><br />
-<input type="text" name="first_name" value="<?php echo $profiledata->first_name ?>" /></label></p>
+<input type="text" name="first_name" value="<?php echo $profileuser->first_name ?>" /></label></p>
 
 <p><label><?php _e('Last name:') ?><br />
-<input type="text" name="last_name"  value="<?php echo $profiledata->last_name ?>" /></label></p>
+<input type="text" name="last_name"  value="<?php echo $profileuser->last_name ?>" /></label></p>
 
 <p><label><?php _e('Nickname:') ?><br />
-<input type="text" name="nickname" value="<?php echo $profiledata->nickname ?>" /></label></p>
+<input type="text" name="nickname" value="<?php echo $profileuser->nickname ?>" /></label></p>
 
 </p><label><?php _e('Display name publicly as:') ?> <br />
 <select name="display_name">
-<option value="<?php echo $profiledata->display_name; ?>"><?php echo $profiledata->display_name; ?></option>
-<option value="<?php echo $profiledata->nickname ?>"><?php echo $profiledata->nickname ?></option>
-<option value="<?php echo $profiledata->user_login ?>"><?php echo $profiledata->user_login ?></option>
-<?php if ( !empty( $profiledata->first_name ) ) : ?>
-<option value="<?php echo $profiledata->first_name ?>"><?php echo $profiledata->first_name ?></option>
+<option value="<?php echo $profileuser->display_name; ?>"><?php echo $profileuser->display_name; ?></option>
+<option value="<?php echo $profileuser->nickname ?>"><?php echo $profileuser->nickname ?></option>
+<option value="<?php echo $profileuser->user_login ?>"><?php echo $profileuser->user_login ?></option>
+<?php if ( !empty( $profileuser->first_name ) ) : ?>
+<option value="<?php echo $profileuser->first_name ?>"><?php echo $profileuser->first_name ?></option>
 <?php endif; ?>
-<?php if ( !empty( $profiledata->last_name ) ) : ?>
-<option value="<?php echo $profiledata->last_name ?>"><?php echo $profiledata->last_name ?></option>
+<?php if ( !empty( $profileuser->last_name ) ) : ?>
+<option value="<?php echo $profileuser->last_name ?>"><?php echo $profileuser->last_name ?></option>
 <?php endif; ?>
-<?php if ( !empty( $profiledata->first_name ) && !empty( $profiledata->last_name ) ) : ?>
-<option value="<?php echo $profiledata->first_name." ".$profiledata->last_name ?>"><?php echo $profiledata->first_name." ".$profiledata->last_name ?></option>
-<option value="<?php echo $profiledata->last_name." ".$profiledata->first_name ?>"><?php echo $profiledata->last_name." ".$profiledata->first_name ?></option>
+<?php if ( !empty( $profileuser->first_name ) && !empty( $profileuser->last_name ) ) : ?>
+<option value="<?php echo $profileuser->first_name." ".$profileuser->last_name ?>"><?php echo $profileuser->first_name." ".$profileuser->last_name ?></option>
+<option value="<?php echo $profileuser->last_name." ".$profileuser->first_name ?>"><?php echo $profileuser->last_name." ".$profileuser->first_name ?></option>
 <?php endif; ?>
 </select></label></p>
 </fieldset>
@@ -62,29 +61,29 @@ $bookmarklet_height= 440;
 <legend><?php _e('Contact Info'); ?></legend>
 
 <p><label><?php _e('E-mail: (required)') ?><br />
-<input type="text" name="email" value="<?php echo $profiledata->user_email ?>" /></label></p>
+<input type="text" name="email" value="<?php echo $profileuser->user_email ?>" /></label></p>
 
 <p><label><?php _e('Website:') ?><br />
-<input type="text" name="url" value="<?php echo $profiledata->user_url ?>" />
+<input type="text" name="url" value="<?php echo $profileuser->user_url ?>" />
 </label></p>
 
 <p><label><?php _e('AIM:') ?><br />
-<input type="text" name="aim" value="<?php echo $profiledata->aim ?>" />
+<input type="text" name="aim" value="<?php echo $profileuser->aim ?>" />
 </label></p>
 
 <p><label><?php _e('Yahoo IM:') ?><br />
-<input type="text" name="yim" value="<?php echo $profiledata->yim ?>" />
+<input type="text" name="yim" value="<?php echo $profileuser->yim ?>" />
 </label></p>
 
 <p><label><?php _e('Jabber / Google Talk:') ?>
-<input type="text" name="jabber" value="<?php echo $profiledata->jabber ?>" /></label>
+<input type="text" name="jabber" value="<?php echo $profileuser->jabber ?>" /></label>
 </p>
 </fieldset>
 <br clear="all" />
 <fieldset>
 <legend><?php _e('About yourself'); ?></legend>
 <p class="desc"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p>
-<p><textarea name="description" rows="5" cols="30"><?php echo $profiledata->description ?></textarea></p>
+<p><textarea name="description" rows="5" cols="30"><?php echo $profileuser->description ?></textarea></p>
 </fieldset>
 
 <?php
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 32cf47ac9..84c684676 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -48,7 +48,6 @@ default:
 include ('admin-header.php');
 
 $profileuser = new WP_User($user_id);
-$profiledata = $profileuser->data;
 
 if (!current_user_can('edit_users')) $errors['head'] = __('You do not have permission to edit this user.');
 ?>
@@ -80,7 +79,7 @@ if (!current_user_can('edit_users')) $errors['head'] = __('You do not have permi
 <fieldset>
 <legend><?php _e('Name'); ?></legend>
 <p><label><?php _e('Username: (no editing)'); ?><br />
-<input type="text" name="user_login" value="<?php echo $profiledata->user_login; ?>" disabled="disabled" />
+<input type="text" name="user_login" value="<?php echo $profileuser->user_login; ?>" disabled="disabled" />
 </label></p>
 
 <p><label><?php _e('Role:') ?><br />
@@ -95,28 +94,28 @@ echo '</select>';
 ?></label></p>
 
 <p><label><?php _e('First name:') ?><br />
-<input type="text" name="first_name" value="<?php echo $profiledata->first_name ?>" /></label></p>
+<input type="text" name="first_name" value="<?php echo $profileuser->first_name ?>" /></label></p>
 
 <p><label><?php _e('Last name:') ?><br />
-<input type="text" name="last_name"  value="<?php echo $profiledata->last_name ?>" /></label></p>
+<input type="text" name="last_name"  value="<?php echo $profileuser->last_name ?>" /></label></p>
 
 <p><label><?php _e('Nickname:') ?><br />
-<input type="text" name="nickname" value="<?php echo $profiledata->nickname ?>" /></label></p>
+<input type="text" name="nickname" value="<?php echo $profileuser->nickname ?>" /></label></p>
 
 </p><label><?php _e('Display name publicly as:') ?> <br />
 <select name="display_name">
-<option value="<?php echo $profiledata->display_name; ?>"><?php echo $profiledata->display_name; ?></option>
-<option value="<?php echo $profiledata->nickname ?>"><?php echo $profiledata->nickname ?></option>
-<option value="<?php echo $profiledata->user_login ?>"><?php echo $profiledata->user_login ?></option>
-<?php if ( !empty( $profiledata->first_name ) ) : ?>
-<option value="<?php echo $profiledata->first_name ?>"><?php echo $profiledata->first_name ?></option>
+<option value="<?php echo $profileuser->display_name; ?>"><?php echo $profileuser->display_name; ?></option>
+<option value="<?php echo $profileuser->nickname ?>"><?php echo $profileuser->nickname ?></option>
+<option value="<?php echo $profileuser->user_login ?>"><?php echo $profileuser->user_login ?></option>
+<?php if ( !empty( $profileuser->first_name ) ) : ?>
+<option value="<?php echo $profileuser->first_name ?>"><?php echo $profileuser->first_name ?></option>
 <?php endif; ?>
-<?php if ( !empty( $profiledata->last_name ) ) : ?>
-<option value="<?php echo $profiledata->last_name ?>"><?php echo $profiledata->last_name ?></option>
+<?php if ( !empty( $profileuser->last_name ) ) : ?>
+<option value="<?php echo $profileuser->last_name ?>"><?php echo $profileuser->last_name ?></option>
 <?php endif; ?>
-<?php if ( !empty( $profiledata->first_name ) && !empty( $profiledata->last_name ) ) : ?>
-<option value="<?php echo $profiledata->first_name." ".$profiledata->last_name ?>"><?php echo $profiledata->first_name." ".$profiledata->last_name ?></option>
-<option value="<?php echo $profiledata->last_name." ".$profiledata->first_name ?>"><?php echo $profiledata->last_name." ".$profiledata->first_name ?></option>
+<?php if ( !empty( $profileuser->first_name ) && !empty( $profileuser->last_name ) ) : ?>
+<option value="<?php echo $profileuser->first_name." ".$profileuser->last_name ?>"><?php echo $profileuser->first_name." ".$profileuser->last_name ?></option>
+<option value="<?php echo $profileuser->last_name." ".$profileuser->first_name ?>"><?php echo $profileuser->last_name." ".$profileuser->first_name ?></option>
 <?php endif; ?>
 </select></label></p>
 </fieldset>
@@ -125,29 +124,29 @@ echo '</select>';
 <legend><?php _e('Contact Info'); ?></legend>
 
 <p><label><?php _e('E-mail: (required)') ?><br />
-<input type="text" name="email" value="<?php echo $profiledata->user_email ?>" /></label></p>
+<input type="text" name="email" value="<?php echo $profileuser->user_email ?>" /></label></p>
 
 <p><label><?php _e('Website:') ?><br />
-<input type="text" name="url" value="<?php echo $profiledata->user_url ?>" />
+<input type="text" name="url" value="<?php echo $profileuser->user_url ?>" />
 </label></p>
 
 <p><label><?php _e('AIM:') ?><br />
-<input type="text" name="aim" value="<?php echo $profiledata->aim ?>" />
+<input type="text" name="aim" value="<?php echo $profileuser->aim ?>" />
 </label></p>
 
 <p><label><?php _e('Yahoo IM:') ?><br />
-<input type="text" name="yim" value="<?php echo $profiledata->yim ?>" />
+<input type="text" name="yim" value="<?php echo $profileuser->yim ?>" />
 </label></p>
 
 <p><label><?php _e('Jabber / Google Talk:') ?>
-<input type="text" name="jabber" value="<?php echo $profiledata->jabber ?>" /></label>
+<input type="text" name="jabber" value="<?php echo $profileuser->jabber ?>" /></label>
 </p>
 </fieldset>
 <br clear="all" />
 <fieldset>
 <legend><?php _e('About the user'); ?></legend>
 <p class="desc"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p>
-<p><textarea name="description" rows="5" cols="30"><?php echo $profiledata->description ?></textarea></p>
+<p><textarea name="description" rows="5" cols="30"><?php echo $profileuser->description ?></textarea></p>
 </fieldset>
 
 <?php
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 7118079d8..731c565e3 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -95,9 +95,9 @@ case 'delete':
  	foreach ($userids as $id) {
  		$user = new WP_User($id);
 		if ($id == $current_user->id) {
-			echo "<li>" . sprintf('ID #%1s: %2s <strong>The current user will not be deleted.</strong>', $id, $user->data->user_login) . "</li>\n";
+			echo "<li>" . sprintf('ID #%1s: %2s <strong>The current user will not be deleted.</strong>', $id, $user->user_login) . "</li>\n";
 		} else {
-			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf('ID #%1s: %2s', $id, $user->data->user_login) . "</li>\n";
+			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />" . sprintf('ID #%1s: %2s', $id, $user->user_login) . "</li>\n";
 			$go_delete = true;
 		}
  	}
@@ -150,7 +150,7 @@ default:
 		$tmp_user = new WP_User($userid);
 		$roles = $tmp_user->roles;
 		$role = $roles[0];
-		$roleclasses[$role][$tmp_user->data->user_login] = $tmp_user;
+		$roleclasses[$role][$tmp_user->user_login] = $tmp_user;
 	}	
 	
 	?>
@@ -225,9 +225,8 @@ default:
 	<?php
 	$style = '';
 	foreach ($roleclass as $user_object) {
-		$user_data = &$user_object->data;
-		$email = $user_data->user_email;
-		$url = $user_data->user_url;
+		$email = $user_object->user_email;
+		$url = $user_object->user_url;
 		$short_url = str_replace('http://', '', $url);
 		$short_url = str_replace('www.', '', $short_url);
 		if ('/' == substr($short_url, -1))
@@ -235,19 +234,19 @@ default:
 		if (strlen($short_url) > 35)
 		$short_url =  substr($short_url, 0, 32).'...';
 		$style = ('class="alternate"' == $style) ? '' : 'class="alternate"';
-		$numposts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_author = '$user_data->ID' and post_status = 'publish'");
-		if (0 < $numposts) $numposts = "<a href='edit.php?author=$user_data->ID' title='" . __('View posts') . "'>$numposts</a>";
+		$numposts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_author = '$user_object->ID' and post_status = 'publish'");
+		if (0 < $numposts) $numposts = "<a href='edit.php?author=$user_object->ID' title='" . __('View posts') . "'>$numposts</a>";
 		echo "
 <tr $style>
-	<td><input type='checkbox' name='users[]' id='user_{$user_data->ID}' value='{$user_data->ID}' /> <label for='user_{$user_data->ID}'>{$user_data->ID}</label></td>
-	<td><label for='user_{$user_data->ID}'><strong>$user_data->user_login</strong></label></td>
-	<td><label for='user_{$user_data->ID}'>$user_data->first_name $user_data->last_name</label></td>
+	<td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' value='{$user_object->ID}' /> <label for='user_{$user_object->ID}'>{$user_object->ID}</label></td>
+	<td><label for='user_{$user_object->ID}'><strong>$user_object->user_login</strong></label></td>
+	<td><label for='user_{$user_object->ID}'>$user_object->first_name $user_object->last_name</label></td>
 	<td><a href='mailto:$email' title='" . sprintf(__('e-mail: %s'), $email) . "'>$email</a></td>
 	<td><a href='$url' title='website: $url'>$short_url</a></td>";
 	echo "<td align='right'>$numposts</td>";
 	echo '<td>';
 	if (current_user_can('edit_users'))
-		echo "<a href='user-edit.php?user_id=$user_data->ID' class='edit'>".__('Edit')."</a>";
+		echo "<a href='user-edit.php?user_id=$user_object->ID' class='edit'>".__('Edit')."</a>";
 	echo '</td>';
 	echo '</tr>';
 	}
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 236c88461..4dac1bfc1 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -123,9 +123,13 @@ class WP_User {
 		if ( empty($this->data->ID) )
 			return;
 
-		$this->id = $this->data->ID;
+		foreach (get_object_vars($this->data) as $key => $value) {
+			$this->{$key} = $value;
+		}
+
+		$this->id = $this->ID;
 		$this->cap_key = $table_prefix . 'capabilities';
-		$this->caps = &$this->data->{$this->cap_key};
+		$this->caps = &$this->{$this->cap_key};
 		if ( ! is_array($this->caps) )
 			$this->caps = array();
 		$this->get_role_caps();
@@ -182,8 +186,8 @@ class WP_User {
 	
 	function update_user_level_from_caps() {
 	    global $table_prefix;
-	    $this->data->user_level = array_reduce(array_keys($this->allcaps), 	array(&$this, 'level_reduction'), 0);
-	    update_usermeta($this->id, $table_prefix.'user_level', $this->data->user_level);
+	    $this->user_level = array_reduce(array_keys($this->allcaps), 	array(&$this, 'level_reduction'), 0);
+	    update_usermeta($this->id, $table_prefix.'user_level', $this->user_level);
 	}
 	
 	function add_cap($cap, $grant = true) {
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 052d6e0bc..8c0becb8f 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -299,10 +299,10 @@ function get_option($option) {
 
 function get_user_option( $option ) {
 	global $wpdb, $current_user;
-	if ( isset( $current_user->data->{$wpdb->prefix . $option} ) ) // Blog specific
-		return $current_user->data->{$wpdb->prefix . $option};
-	elseif ( isset( $current_user->data->{$option} ) ) // User specific and cross-blog
-		return $current_user->data->{$option};
+	if ( isset( $current_user->{$wpdb->prefix . $option} ) ) // Blog specific
+		return $current_user->{$wpdb->prefix . $option};
+	elseif ( isset( $current_user->{$option} ) ) // User specific and cross-blog
+		return $current_user->{$option};
 	else // Blog global
 		return get_option( $option );
 }
diff --git a/wp-includes/pluggable-functions.php b/wp-includes/pluggable-functions.php
index 3b67d3116..5e1cb5a2d 100644
--- a/wp-includes/pluggable-functions.php
+++ b/wp-includes/pluggable-functions.php
@@ -365,8 +365,8 @@ function wp_new_user_notification($user_id, $plaintext_pass = '') {
 	for ($i = 0; $i < strlen($pass1); $i = $i + 1)
 		$stars .= '*';
 	
-	$user_login = stripslashes($user->data->user_login);
-	$user_email = stripslashes($user->data->user_email);
+	$user_login = stripslashes($user->user_login);
+	$user_email = stripslashes($user->user_email);
 	
 	$message  = sprintf(__('New user registration on your blog %s:'), get_settings('blogname')) . "\r\n\r\n";
 	$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";