Massive WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@417 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 4 insertions, 10 deletions

diff --git a/wp-inst/wp-admin/profile.php b/wp-inst/wp-admin/profile.php
index 8621618..2250a24 100644
--- a/wp-inst/wp-admin/profile.php
+++ b/wp-inst/wp-admin/profile.php
@@ -30,12 +30,13 @@ $bookmarklet_height= 440;
 <p><label><?php _e('Username: (no editing)'); ?><br />
 <input type="text" name="user_login" value="<?php echo $profiledata->user_login; ?>" disabled="disabled" />
 </label></p>
+
+<p><label><?php _e('Role: (no editing)') ?><br />
+<input type="text" name="role" value="<?php echo $wp_roles->role_names[$profileuser->roles[0]] ?>" 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>
 
-<p><label><?php _e('Middle name:') ?><br />
-<input type="text" name="middle_name" value="<?php echo $profiledata->middle_name ?>" /></label></p>
-
 <p><label><?php _e('Last name:') ?><br />
 <input type="text" name="last_name"  value="<?php echo $profiledata->last_name ?>" /></label></p>
 
@@ -56,9 +57,6 @@ $bookmarklet_height= 440;
 <?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( $profiledata->middle_name ) ) : ?>
-<option value="<?php echo $n = $profiledata->first_name." ".$profiledata->middle_name." ".$profiledata->last_name ?>"><?php echo $n ?></option>
-<?php endif; ?>
 <?php endif; ?>
 </select></label></p>
 </fieldset>
@@ -73,10 +71,6 @@ $bookmarklet_height= 440;
 <input type="text" name="url" value="<?php echo $profiledata->user_url ?>" />
 </label></p>
 
-<p><label><?php _e('Flickr Username:') ?><br />
-<input type="text" name="flickr_username" value="<?php echo $profiledata->flickr_username ?>" />
-</label></p>
-
 <p><label><?php _e('AIM:') ?><br />
 <input type="text" name="aim" value="<?php echo $profiledata->aim ?>" />
 </label></p>