Changeset 2636

Show
Ignore:
Timestamp:
06/13/05 08:32:44 (3 years ago)
Author:
matt
Message:

User data migration should be complete

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/edit-form-advanced.php

    r2537 r2636  
    151151        <td><input name="post_name" type="text" size="25" id="post_name" value="<?php echo $post_name ?>" /></td> 
    152152    </tr> 
    153 <?php if ($user_level > 7 && $users = $wpdb->get_results("SELECT ID, user_login, user_firstname, user_lastname FROM $wpdb->users WHERE user_level <= $user_level AND user_level > 0") ) : ?> 
     153<?php if ($user_level > 7 && $users = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users WHERE user_level <= $user_level AND user_level > 0") ) : ?> 
    154154    <tr> 
    155155        <th scope="row"><?php _e('Post author'); ?>:</th> 
    …… 
    158158        <?php  
    159159        foreach ($users as $o) : 
     160            $o = get_userdata( $o->ID ); 
    160161            if ( $post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"'; 
    161162            else $selected = ''; 
    162             echo "<option value='$o->ID' $selected>$o->user_login ($o->user_firstname $o->user_lastname)</option>"; 
     163            echo "<option value='$o->ID' $selected>$o->user_login ($o->first_name $o->last_name)</option>"; 
    163164        endforeach; 
    164165        ?> 

  • trunk/wp-admin/edit-page-form.php

    r2412 r2636  
    109109        <td><input name="post_name" type="text" size="25" id="post_name" value="<?php echo $post_name ?>" /></td> 
    110110    </tr> 
    111 <?php if ($user_level > 7 && $users = $wpdb->get_results("SELECT ID, user_login, user_firstname, user_lastname FROM $wpdb->users WHERE user_level <= $user_level AND user_level > 0") ) : ?> 
     111<?php if ($user_level > 7 && $users = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users WHERE user_level <= $user_level AND user_level > 0") ) : ?> 
    112112    <tr> 
    113113        <th scope="row" width="30%"><?php _e('Page owner'); ?>:</th> 
    …… 
    116116        <?php  
    117117        foreach ($users as $o) : 
     118            $o = get_userdata( $O->ID ); 
    118119            if ( $post_author == $o->ID ) $selected = 'selected="selected"'; 
    119120            else $selected = ''; 
    120             echo "<option value='$o->ID' $selected>$o->user_login ($o->user_firstname $o->user_lastname)</option>"; 
     121            echo "<option value='$o->ID' $selected>$o->user_login ($o->first_name $o->last_name)</option>"; 
    121122        endforeach; 
    122123        ?> 

  • trunk/wp-admin/import-blogger.php

    r2548 r2636  
    6767            $user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$post_author'"); 
    6868            if (!$user) { // seems s/he's not, so let's register 
    69                 $user_ip = '127.0.0.1'; 
    70                 $user_domain = 'localhost'; 
    71                 $user_browser = 'server'; 
    7269                $user_joindate = '1979-06-06 00:41:00'; // that's my birthdate (gmt+1) - I could choose any other date. You could change the date too. Just remember the year must be >=1970 or the world would just randomly fall on your head (everything might look fine, and then blam! major headache!) 
    7370                $user_login = addslashes($post_author); 
    7471                $pass1 = addslashes('password'); 
    75                 $user_nickname = addslashes($post_author); 
    7672                $user_email = addslashes('user@wordpress.org'); 
    7773                $user_url = addslashes(''); 
    …… 
    8177                    user_login, 
    8278                    user_pass, 
    83                     user_nickname, 
    8479                    user_email, 
    8580                    user_url, 
    86                     user_ip, 
    87                     user_domain, 
    88                     user_browser, 
    8981                    user_registered, 
    9082                    user_level, 
    91                     user_idmode 
    9283                ) VALUES ( 
    9384                    '$user_login', 
    9485                    '$pass1', 
    95                     '$user_nickname', 
    9686                    '$user_email', 
    9787                    '$user_url', 
    98                     '$user_ip', 
    99                     '$user_domain', 
    100                     '$user_browser', 
    10188                    '$user_joindate', 
    10289                    '1', 
    103                     'nickname' 
    10490                )"); 
    10591 

  • trunk/wp-admin/import-greymatter.php

    r2565 r2636  
    8888        $userdata=explode("|", $user); 
    8989 
    90         $user_ip="127.0.0.1"; 
    91         $user_domain="localhost"; 
    92         $user_browser="server"; 
    93  
    9490        $s=$userdata[4]; 
    9591        $user_joindate=substr($s,6,4)."-".substr($s,0,2)."-".substr($s,3,2)." 00:00:00"; 
    …… 
    108104        } 
    109105 
    110         $query = "INSERT INTO $wpdb->users (user_login,user_pass,user_nickname,user_email,user_url,user_ip,user_domain,user_browser,user_registered,user_level,user_idmode) VALUES ('$user_login','$pass1','$user_nickname','$user_email','$user_url','$user_ip','$user_domain','$user_browser','$user_joindate','1','nickname')"; 
     106        $query = "INSERT INTO $wpdb->users (user_login,user_pass,user_email,user_url,user_registered,user_level) VALUES ('$user_login','$pass1','$user_email','$user_url','$user_joindate','1')"; 
    111107        $result = $wpdb->query($query); 
    112108        if ($result==false) { 
    …… 
    157153            $result = $wpdb->query($sql); 
    158154            if (! $result) { // if deleted from GM, we register the author as a level 0 user in wp 
    159                 $user_ip="127.0.0.1"; 
    160                 $user_domain="localhost"; 
    161                 $user_browser="server"; 
    162155                $user_joindate="1979-06-06 00:41:00"; 
    163156                $user_login=addslashes($post_author); 
    …… 
    167160                $user_url=addslashes(""); 
    168161                $user_joindate=addslashes($user_joindate); 
    169                 $query = "INSERT INTO $wpdb->users (user_login,user_pass,user_nickname,user_email,user_url,user_ip,user_domain,user_browser,user_registered,user_level,user_idmode) VALUES ('$user_login','$pass1','$user_nickname','$user_email','$user_url','$user_ip','$user_domain','$user_browser','$user_joindate','0','nickname')"; 
     162                $query = "INSERT INTO $wpdb->users (user_login,user_pass,user_email,user_url,user_registered,user_level) VALUES ('$user_login','$pass1','$user_email','$user_url','$user_joindate','0')"; 
    170163                $result = $wpdb->query($query); 
    171164                if ($result==false) { 

  • trunk/wp-admin/profile.php

    r2632 r2636  
    7373    $newuser_firstname = wp_specialchars($_POST['newuser_firstname']); 
    7474    $newuser_lastname = wp_specialchars($_POST['newuser_lastname']); 
     75    $new_display_name = wp_specialchars($_POST['display_name']); 
    7576    $newuser_nickname = $_POST['newuser_nickname']; 
    7677    $newuser_nicename = sanitize_title($newuser_nickname); 
    …… 
    8283    $newuser_url = wp_specialchars($_POST['newuser_url']); 
    8384    $newuser_url = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $newuser_url) ? $newuser_url : 'http://' . $newuser_url;  
    84     $newuser_idmode = wp_specialchars($_POST['newuser_idmode']); 
    8585    $user_description = $_POST['user_description']; 
    8686 
    87     $result = $wpdb->query("UPDATE $wpdb->users SET $updatepassword user_email='$newuser_email', user_url='$newuser_url', user_nicename = '$newuser_nicename' WHERE ID = $user_ID"); 
    88  
    89     update_user_meta( $user_ID, 'first_name', $newuser_firstname ); 
    90     update_user_meta( $user_ID, 'last_name', $newuser_lastname ); 
    91     update_user_meta( $user_ID, 'nickname', $newuser_nickname ); 
    92     update_user_meta( $user_ID, 'description', $user_description ); 
    93     update_user_meta( $user_ID, 'icq', $newuser_icq ); 
    94     update_user_meta( $user_ID, 'aim', $newuser_aim ); 
    95     update_user_meta( $user_ID, 'msn', $newuser_msn ); 
    96     update_user_meta( $user_ID, 'yim', $newuser_yim ); 
     87    $result = $wpdb->query("UPDATE $wpdb->users SET $updatepassword user_email='$newuser_email', user_url='$newuser_url', user_nicename = '$newuser_nicename', display_name = '$new_display_name' WHERE ID = $user_ID"); 
     88 
     89    update_usermeta( $user_ID, 'first_name', $newuser_firstname ); 
     90    update_usermeta( $user_ID, 'last_name', $newuser_lastname ); 
     91    update_usermeta( $user_ID, 'nickname', $newuser_nickname ); 
     92    update_usermeta( $user_ID, 'description', $user_description ); 
     93    update_usermeta( $user_ID, 'icq', $newuser_icq ); 
     94    update_usermeta( $user_ID, 'aim', $newuser_aim ); 
     95    update_usermeta( $user_ID, 'msn', $newuser_msn ); 
     96    update_usermeta( $user_ID, 'yim', $newuser_yim ); 
    9797 
    9898    do_action('profile_update', $user_ID); 
    …… 
    137137    $parent_file = 'profile.php'; 
    138138    include_once('admin-header.php'); 
    139     $profiledata=get_userdata($user_ID); 
     139    $profiledata = get_userdata($user_ID); 
    140140 
    141141    $bookmarklet_height= 440; 
    142142 
     143var_dump( $profiledata ); 
    143144if (isset($updated)) { ?> 
    144145<div class="updated"> 
    …… 
    172173    <tr> 
    173174      <th scope="row"><?php _e('First name:') ?></th> 
    174       <td><input type="text" name="newuser_firstname" id="newuser_firstname" value="<?php echo $profiledata->user_firstname ?>" /></td> 
     175      <td><input type="text" name="newuser_firstname" id="newuser_firstname" value="<?php echo $profiledata->first_name ?>" /></td> 
    175176    </tr> 
    176177    <tr> 
    177178      <th scope="row"><?php _e('Last name:') ?></th> 
    178       <td><input type="text" name="newuser_lastname" id="newuser_lastname2" value="<?php echo $profiledata->user_lastname ?>" /></td> 
     179      <td><input type="text" name="newuser_lastname" id="newuser_lastname2" value="<?php echo $profiledata->last_name ?>" /></td> 
    179180    </tr> 
    180181    <tr> 
    181182      <th scope="row"><?php _e('Nickname:') ?></th> 
    182       <td><input type="text" name="newuser_nickname" id="newuser_nickname2" value="<?php echo $profiledata->user_nickname ?>" /></td> 
     183      <td><input type="text" name="newuser_nickname" id="newuser_nickname2" value="<?php echo $profiledata->nickname ?>" /></td> 
    183184    </tr> 
    184185    <tr> 
    185186      <th scope="row"><?php _e('How to display name:') ?> </th> 
    186       <td><select name="newuser_idmode"> 
    187         <option value="nickname"<?php 
    188     if ($profiledata->user_idmode == 'nickname') 
    189     echo ' selected="selected"'; ?>><?php echo $profiledata->user_nickname ?></option> 
    190         <option value="login"<?php 
    191     if ($profiledata->user_idmode=="login") 
    192     echo ' selected="selected"'; ?>><?php echo $profiledata->user_login ?></option> 
    193     <?php if ( !empty( $profiledata->user_firstname ) ) : ?> 
    194         <option value="firstname"<?php 
    195     if ($profiledata->user_idmode=="firstname") 
    196     echo ' selected="selected"'; ?>><?php echo $profiledata->user_firstname ?></option> 
     187      <td> 
     188    <select name="display_name"> 
     189        <option value="<?php echo $profiledata->display_name; ?>"><?php echo $profiledata->display_name; ?></option> 
     190        <option value="<?php echo $profiledata->nickname ?>"><?php echo $profiledata->nickname ?></option> 
     191        <option value="<?php echo $profiledata->user_login ?>"><?php echo $profiledata->user_login ?></option> 
     192    <?php if ( !empty( $profiledata->first_name ) ) : ?> 
     193        <option value="<?php echo $profiledata->first_name ?>"><?php echo $profiledata->first_name ?></option> 
    197194    <?php endif; ?> 
    198     <?php if ( !empty( $profiledata->user_lastname ) ) : ?> 
    199         <option value="lastname"<?php 
    200     if ($profiledata->user_idmode=="lastname") 
    201     echo ' selected="selected"'; ?>><?php echo $profiledata->user_lastname ?></option> 
     195    <?php if ( !empty( $profiledata->last_name ) ) : ?> 
     196        <option value="<?php echo $profiledata->last_name ?>"><?php echo $profiledata->last_name ?></option> 
    202197    <?php endif; ?> 
    203     <?php if ( !empty( $profiledata->user_firstname ) && !empty( $profiledata->user_lastname ) ) : ?> 
    204         <option value="namefl"<?php 
    205     if ($profiledata->user_idmode=="namefl") 
    206     echo ' selected="selected"'; ?>><?php echo $profiledata->user_firstname." ".$profiledata->user_lastname ?></option> 
    207     <?php endif; ?> 
    208     <?php if ( !empty( $profiledata->user_firstname ) && !empty( $profiledata->user_lastname ) ) : ?> 
    209         <option value="namelf"<?php 
    210     if ($profiledata->user_idmode=="namelf") 
    211     echo ' selected="selected"'; ?>><?php echo $profiledata->user_lastname." ".$profiledata->user_firstname ?></option> 
     198    <?php if ( !empty( $profiledata->first_name ) && !empty( $profiledata->last_name ) ) : ?> 
     199        <option value="<?php echo $profiledata->first_name." ".$profiledata->last_name ?>"><?php echo $profiledata->first_name." ".$profiledata->last_name ?></option> 
     200        <option value="<?php echo $profiledata->last_name." ".$profiledata->first_name ?>"><?php echo $profiledata->last_name." ".$profiledata->first_name ?></option> 
    212201    <?php endif; ?> 
    213202      </select>        </td> 
    …… 
    223212    <tr> 
    224213      <th scope="row"><?php _e('ICQ:') ?></th> 
    225       <td><input type="text" name="newuser_icq" id="newuser_icq2" value="<?php if ($profiledata->user_icq > 0) { echo $profiledata->user_icq; } ?>" /></td> 
     214      <td><input type="text" name="newuser_icq" id="newuser_icq2" value="<?php if ($profiledata->icq > 0) { echo $profiledata->icq; } ?>" /></td> 
    226215    </tr> 
    227216    <tr> 
    228217      <th scope="row"><?php _e('AIM:') ?></th> 
    229       <td><input type="text" name="newuser_aim" id="newuser_aim2" value="<?php echo $profiledata->user_aim ?>" /></td> 
     218      <td><input type="text" name="newuser_aim" id="newuser_aim2" value="<?php echo $profiledata->aim ?>" /></td> 
    230219    </tr> 
    231220    <tr> 
    232221      <th scope="row"><?php _e('MSN IM:') ?> </th> 
    233       <td><input type="text" name="newuser_msn" id="newuser_msn2" value="<?php echo $profiledata->user_msn ?>" /></td> 
     222      <td><input type="text" name="newuser_msn" id="newuser_msn2" value="<?php echo $profiledata->msn ?>" /></td> 
    234223    </tr> 
    235224    <tr> 
    236225      <th scope="row"><?php _e('Yahoo IM:') ?> </th> 
    237       <td>        <input type="text" name="newuser_yim" id="newuser_yim2" value="<?php echo $profiledata->user_yim ?>" />      </td> 
     226      <td>        <input type="text" name="newuser_yim" id="newuser_yim2" value="<?php echo $profiledata->yim ?>" />      </td> 
    238227    </tr> 
    239228    <tr> 

  • trunk/wp-admin/upgrade-schema.php

    r2631 r2636  
    126126  user_login varchar(60) NOT NULL default '', 
    127127  user_pass varchar(64) NOT NULL default '', 
    128   user_firstname varchar(50) NOT NULL default '', 
    129   user_lastname varchar(50) NOT NULL default '', 
    130   user_nickname varchar(50) NOT NULL default '', 
    131128  user_nicename varchar(50) NOT NULL default '', 
    132   user_icq int(10) unsigned NOT NULL default '0', 
    133129  user_email varchar(100) NOT NULL default '', 
    134130  user_url varchar(100) NOT NULL default '', 
    135   user_ip varchar(15) NOT NULL default '', 
    136   user_domain varchar(200) NOT NULL default '', 
    137   user_browser varchar(200) NOT NULL default '', 
    138131  user_registered datetime NOT NULL default '0000-00-00 00:00:00', 
    139132  user_level int(2) unsigned NOT NULL default '0', 
    140   user_aim varchar(50) NOT NULL default '', 
    141   user_msn varchar(100) NOT NULL default '', 
    142   user_yim varchar(50) NOT NULL default '', 
    143   user_idmode varchar(20) NOT NULL default '', 
    144133  user_activation_key varchar(60) NOT NULL default '', 
    145134  user_status int(11) NOT NULL default '0', 
    146   user_description longtext NOT NULL default '', 
    147135  display_name varchar(250) NOT NULL default '', 
    148136  PRIMARY KEY  (ID), 

  • trunk/wp-admin/user-edit.php

    r2632 r2636  
    6464$new_url         = wp_specialchars($_POST['new_url']); 
    6565$new_url         = preg_match('/^(https?|ftps?|mailto|news|gopher):/is', $new_url) ? $new_url : 'http://' . $new_url;  
    66 $new_idmode      = wp_specialchars($_POST['new_idmode']); 
     66$display_name    = wp_specialchars($_POST['display_name']); 
    6767$new_description = $_POST['new_description']; 
    6868 
    69 $result = $wpdb->query("UPDATE $wpdb->users SET user_login = '$new_user_login', $updatepassword user_email='$new_email', user_url='$new_url', user_nicename = '$new_nicename' WHERE ID = '$user_id'"); 
    70  
    71 update_user_meta( $user_ID, 'first_name', $new_firstname ); 
    72 update_user_meta( $user_ID, 'last_name', $new_lastname ); 
    73 update_user_meta( $user_ID, 'nickname', $new_nickname ); 
    74 update_user_meta( $user_ID, 'description', $new_description ); 
    75 update_user_meta( $user_ID, 'icq', $new_icq ); 
    76 update_user_meta( $user_ID, 'aim', $new_aim ); 
    77 update_user_meta( $user_ID, 'msn', $new_msn ); 
    78 update_user_meta( $user_ID, 'yim', $new_yim ); 
     69$result = $wpdb->query("UPDATE $wpdb->users SET user_login = '$new_user_login', $updatepassword user_email='$new_email', user_url='$new_url', user_nicename = '$new_nicename', display_name = '$display_name' WHERE ID = '$user_id'"); 
     70 
     71update_usermeta( $user_ID, 'first_name', $new_firstname ); 
     72update_usermeta( $user_ID, 'last_name', $new_lastname ); 
     73update_usermeta( $user_ID, 'nickname', $new_nickname ); 
     74update_usermeta( $user_ID, 'description', $new_description ); 
     75update_usermeta( $user_ID, 'icq', $new_icq ); 
     76update_usermeta( $user_ID, 'aim', $new_aim ); 
     77update_usermeta( $user_ID, 'msn', $new_msn ); 
     78update_usermeta( $user_ID, 'yim', $new_yim ); 
    7979 
    8080header("Location: user-edit.php?user_id=$user_id&updated=true"); 
    …… 
    128128    <tr> 
    129129        <th scope="row"><?php _e('First name:') ?></th> 
    130         <td><input type="text" name="new_firstname" id="new_firstname" value="<?php echo $edituser->user_firstname ?>" /></td> 
     130        <td><input type="text" name="new_firstname" id="new_firstname" value="<?php echo $edituser->first_name ?>" /></td> 
    131131    </tr> 
    132132    <tr> 
    133133        <th scope="row"><?php _e('Last name:') ?></th> 
    134         <td><input type="text" name="new_lastname" id="new_lastname2" value="<?php echo $edituser->user_lastname ?>" /></td> 
     134        <td><input type="text" name="new_lastname" id="new_lastname2" value="<?php echo $edituser->last_name ?>" /></td> 
    135135    </tr> 
    136136    <tr> 
    …… 
    140140    <tr> 
    141141        <th scope="row"><?php _e('Nickname:') ?></th> 
    142         <td><input type="text" name="new_nickname" id="new_nickname" value="<?php echo $edituser->user_nickname ?>" /></td> 
     142        <td><input type="text" name="new_nickname" id="new_nickname" value="<?php echo $edituser->nickname ?>" /></td> 
    143143    </tr> 
    144144    <tr> 
    …… 
    152152    <tr> 
    153153        <th scope="row"><?php _e('ICQ:') ?></th> 
    154         <td><input type="text" name="new_icq" id="new_icq" value="<?php if ($edituser->user_icq > 0) { echo $edituser->user_icq; } ?>" /></td> 
     154        <td><input type="text" name="new_icq" id="new_icq" value="<?php if ($edituser->icq > 0) { echo $edituser->icq; } ?>" /></td> 
    155155    </tr> 
    156156    <tr> 
    157157        <th scope="row"><?php _e('AIM:') ?></th> 
    158         <td><input type="text" name="new_aim" id="new_aim" value="<?php echo $edituser->user_aim ?>" /></td> 
     158        <td><input type="text" name="new_aim" id="new_aim" value="<?php echo $edituser->aim ?>" /></td> 
    159159    </tr> 
    160160    <tr> 
    161161        <th scope="row"><?php _e('MSN IM:') ?> 
    162162        </th> 
    163         <td><input type="text" name="new_msn" id="new_msn" value="<?php echo $edituser->user_msn ?>" /></td> 
     163        <td><input type="text" name="new_msn" id="new_msn" value="<?php echo $edituser->msn ?>" /></td> 
    164164    </tr> 
    165165    <tr> 
    166166        <th scope="row"><?php _e('Yahoo IM:') ?> 
    167167        </th> 
    168         <td><input type="text" name="new_yim" id="new_yim" value="<?php echo $edituser->user_yim ?>" /> 
     168        <td><input type="text" name="new_yim" id="new_yim" value="<?php echo $edituser->yim ?>" /> 
    169169        </td> 
    170170    </tr> 
    …… 
    172172        <th scope="row"><?php _e('Identity on blog:') ?> 
    173173        </th> 
    174         <td><select name="new_idmode"> 
    175                 <option value="nickname"<?php 
    176     if ($edituser->user_idmode == 'nickname') 
    177     echo ' selected="selected"'; ?>><?php echo $edituser->user_nickname ?></option> 
    178                 <option value="login"<?php 
    179     if ($edituser->user_idmode=="login") 
    180     echo ' selected="selected"'; ?>><?php echo $edituser->user_login ?></option> 
    181                 <option value="firstname"<?php 
    182     if ($edituser->user_idmode=="firstname") 
    183     echo ' selected="selected"'; ?>><?php echo $edituser->user_firstname ?></option> 
    184                 <option value="lastname"<?php 
    185     if ($edituser->user_idmode=="lastname") 
    186     echo ' selected="selected"'; ?>><?php echo $edituser->user_lastname ?></option> 
    187                 <option value="namefl"<?php 
    188     if ($edituser->user_idmode=="namefl") 
    189     echo ' selected="selected"'; ?>><?php echo $edituser->user_firstname." ".$edituser->user_lastname ?></option> 
    190                 <option value="namelf"<?php 
    191     if ($edituser->user_idmode=="namelf") 
    192     echo ' selected="selected"'; ?>><?php echo $edituser->user_lastname." ".$edituser->user_firstname ?></option> 
    193             </select> 
     174        <td>    <select name="display_name"> 
     175        <option value="<?php echo $profiledata->display_name; ?>"><?php echo $profiledata->display_name; ?></option> 
     176        <option value="<?php echo $profiledata->nickname ?>"><?php echo $profiledata->nickname ?></option> 
     177        <option value="<?php echo $profiledata->user_login ?>"><?php echo $profiledata->user_login ?></option> 
     178    <?php if ( !empty( $profiledata->first_name ) ) : ?> 
     179        <option value="<?php echo $profiledata->first_name ?>"><?php echo $profiledata->first_name ?></option> 
     180    <?php endif; ?> 
     181    <?php if ( !empty( $profiledata->last_name ) ) : ?> 
     182        <option value="<?php echo $profiledata->last_name ?>"><?php echo $profiledata->last_name ?></option> 
     183    <?php endif; ?> 
     184    <?php if ( !empty( $profiledata->first_name ) && !empty( $profiledata->last_name ) ) : ?> 
     185        <option value="<?php echo $profiledata->first_name." ".$profiledata->last_name ?>"><?php echo $profiledata->first_name." ".$profiledata->last_name ?></option> 
     186        <option value="<?php echo $profiledata->last_name." ".$profiledata->first_name ?>"><?php echo $profiledata->last_name." ".$profiledata->first_name ?></option> 
     187    <?php endif; ?> 
     188      </select> 
    194189        </td> 
    195190    </tr> 

  • trunk/wp-admin/users.php

    r2632 r2636  
    198198<tr $style> 
    199199    <td align='center'>$user_data->ID</td> 
    200     <td><strong>$user_data->user_nickname</strong></td> 
    201     <td>$user_data->user_firstname $user_data->user_lastname</td> 
     200    <td><strong>$user_data->user_login</strong></td> 
     201    <td>$user_data->first_name $user_data->last_name</td> 
    202202    <td><a href='mailto:$email' title='" . sprintf(__('e-mail: %s'), $email) . "'>$email</a></td> 
    203203    <td><a href='$url' title='website: $url'>$short_url</a></td> 
    …… 
    253253echo "\n<tr $style> 
    254254<td align='center'>$user_data->ID</td> 
    255 <td><strong>$user_data->user_nickname</strong></td> 
    256 <td>$user_data->user_firstname $user_data->user_lastname</td> 
     255<td><strong>$user_data->user_login</strong></td> 
     256<td>$user_data->first_name $user_data->last_name</td> 
    257257<td><a href='mailto:$email' title='" . sprintf(__('e-mail: %s'), $email) . "'>$email</a></td> 
    258258<td><a href='$url' title='website: $url'>$short_url</a></td> 

  • trunk/wp-includes/functions.php

    r2631 r2636  
    11651165function update_user_cache() { 
    11661166    global $cache_userdata, $wpdb; 
    1167      
    1168     if ( $users = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE user_level > 0") ) : 
     1167    $query = apply_filters('user_cache_query', "SELECT * FROM $wpdb->users WHERE user_level > 0"); 
     1168    if ( $users = $wpdb->get_results( $query ) ) : 
    11691169        foreach ($users as $user) : 
     1170            $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user->ID'"); 
     1171         
     1172            foreach ( $metavalues as $meta ) 
     1173                $user->{$meta->meta_key} = $meta->meta_value; 
    11701174            $cache_userdata[$user->ID] = $user; 
    11711175            $cache_userdata[$user->user_login] =& $cache_userdata[$user->ID]; 
    …… 
    12811285    if ($author == $author_obj->ID) { 
    12821286        return true; 
    1283     } else if ($author == $author_obj->user_nickname) { 
     1287    } else if ($author == $author_obj->nickname) { 
    12841288        return true; 
    12851289    } else if ($author == $author_obj->user_nicename) { 

  • trunk/wp-includes/pluggable-functions.php

    r2634 r2636  
    4343    foreach ( $metavalues as $meta ) 
    4444        $user->{$meta->meta_key} = $meta->meta_value; 
     45 
     46    $cache_userdata[$user_id] = $user; 
    4547 
    4648    $cache_userdata[$cache_userdata[$userid]->user_login] =& $cache_userdata[$user_id]; 

  • trunk/wp-includes/template-functions-author.php

    r2633 r2636  
    2727 
    2828function get_the_author_firstname() { 
    29     global $id,$authordata;    return $authordata->user_firstname; 
     29    global $id,$authordata;    return $authordata->first_name; 
    3030} 
    3131function the_author_firstname() { 
    …… 
    3434 
    3535function get_the_author_lastname() { 
    36     global $id,$authordata;    return $authordata->user_lastname; 
     36    global $id,$authordata;    return $authordata->last_name; 
    3737} 
    3838function the_author_lastname() { 
    …… 
    4141 
    4242function get_the_author_nickname() { 
    43     global $id,$authordata;    return $authordata->user_nickname; 
     43    global $id,$authordata;    return $authordata->nickname; 
    4444} 
    4545function the_author_nickname() { 
    …… 
    7171 
    7272function get_the_author_icq() { 
    73     global $id,$authordata;    return $authordata->user_icq; 
     73    global $id,$authordata;    return $authordata->icq; 
    7474} 
    7575function the_author_icq() { 
    …… 
    7878 
    7979function get_the_author_aim() { 
    80     global $id,$authordata;    return str_replace(' ', '+', $authordata->user_aim); 
     80    global $id,$authordata;    return str_replace(' ', '+', $authordata->aim); 
    8181} 
    8282function the_author_aim() { 
    …… 
    8585 
    8686function get_the_author_yim() { 
    87     global $id,$authordata;    return $authordata->user_yim; 
     87    global $id,$authordata;    return $authordata->yim; 
    8888} 
    8989function the_author_yim() { 
    …… 
    9292 
    9393function get_the_author_msn() { 
    94     global $id,$authordata;    return $authordata->user_msn; 
     94    global $id,$authordata;    return $authordata->msn; 
    9595} 
    9696function the_author_msn() { 
    …… 
    9999 
    100100function get_the_author_posts() { 
    101     global $id,$post;    $posts=get_usernumposts($post->post_author);    return $posts; 
     101    global $id,$post; 
     102    $posts=get_usernumposts($post->post_author); 
     103    return $posts; 
    102104} 
    103105function the_author_posts() { 
    …… 
    153155        $author = get_userdata( $author->ID ); 
    154156        $posts = get_usernumposts($author->ID); 
    155         $name = $author->user_nickname; 
    156  
    157         if ($show_fullname && ($author->user_firstname != '' && $author->user_lastname != '')) { 
    158             $name = "$author->user_firstname $author->user_lastname"; 
     157        $name = $author->nickname; 
     158 
     159        if ($show_fullname && ($author->first_name != '' && $author->last_name != '')) { 
     160            $name = "$author->first_name $author->last_name"; 
    159161        } 
    160162         
    …… 
    164166                $link = $name; 
    165167        } else { 
    166             $link = '<a href="' . get_author_link(0, $author->ID, $author->user_nicename) . '" title="' . sprintf(__("Posts by %s"), wp_specialchars($author->user_nickname)) . '">' . $name . '</a>'; 
     168            $link = '<a href="' . get_author_link(0, $author->ID, $author->user_nicename) . '" title="' . sprintf(__("Posts by %s"), wp_specialchars($author->display_name)) . '">' . $name . '</a>'; 
    167169 
    168170            if ( (! empty($feed_image)) || (! empty($feed)) ) { 

  • trunk/wp-register.php

    r2632 r2636  
    4343        die (__('<strong>ERROR</strong>: This username is already registered, please choose another one.')); 
    4444 
    45     $user_ip = $_SERVER['REMOTE_ADDR'] ; 
    46  
    47     $user_browser = $wpdb->escape($_SERVER['HTTP_USER_AGENT']); 
    48  
    4945    $user_login = $wpdb->escape( sanitize_user($user_login) ) ); 
    50     $user_nickname = $user_login; 
    5146    $user_nicename = sanitize_title($user_nickname); 
    5247    $now = gmdate('Y-m-d H:i:s'); 
    …… 
    5550 
    5651    $result = $wpdb->query("INSERT INTO $wpdb->users  
    57         (user_login, user_pass, user_nickname, user_email, user_ip, user_browser, user_registered, user_level, user_idmode, user_nicename) 
     52        (user_login, user_pass, user_email, user_registered, user_level, user_nicename) 
    5853    VALUES  
    59         ('$user_login', MD5('$password'), '$user_nickname', '$user_email', '$user_ip', '$user_browser', '$now', '$user_level', 'nickname', '$user_nicename')"); 
     54        ('$user_login', MD5('$password'), '$user_email', '$now', '$user_level', '$user_nicename')"); 
    6055 
    6156    do_action('user_register', $wpdb->insert_id); 

  • trunk/xmlrpc.php

    r2619 r2636  
    173173 
    174174      $struct = array( 
    175         'nickname'  => $user_data->user_nickname, 
     175        'nickname'  => $user_data->nickname, 
    176176        'userid'    => $user_data->ID, 
    177177        'url'       => $user_data->user_url, 
    178178        'email'     => $user_data->user_email, 
    179         'lastname'  => $user_data->user_lastname, 
    180         'firstname' => $user_data->user_firstname 
     179        'lastname'  => $user_data->last_name, 
     180        'firstname' => $user_data->first_name 
    181181      ); 
    182182