mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-10-04 14:47:02 +00:00
Pull the values in WP_User::data directly into WP_User so that we don't have to do ->data->blah.
git-svn-id: https://develop.svn.wordpress.org/trunk@3102 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
+20
-21
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user