From c93f3790929357cc1e187dda0dc16c694ebd980f Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Thu, 16 Jun 2005 06:14:07 +0000 Subject: [PATCH] Set display_name only if the user table still containts id_mode. This prevents multiple upgrades from stomping display_name. git-svn-id: https://develop.svn.wordpress.org/trunk@2643 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/upgrade-functions.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php index f6ef1fae7c..aa1fa1361d 100644 --- a/wp-admin/upgrade-functions.php +++ b/wp-admin/upgrade-functions.php @@ -238,16 +238,19 @@ function upgrade_160() { update_usermeta( $user->ID, 'yim', addslashes($user->user_icq) ); if ( !empty( $user->user_description ) ) update_usermeta( $user->ID, 'description', addslashes($user->user_description) ); - $idmode = $user->user_idmode; - if ($idmode == 'nickname') $id = $user->user_nickname; - if ($idmode == 'login') $id = $user->user_login; - if ($idmode == 'firstname') $id = $user->user_firstname; - if ($idmode == 'lastname') $id = $user->user_lastname; - if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname; - if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname; - if (!$idmode) $id = $user->user_nickname; - $id = addslashes( $id ); - $wpdb->query("UPDATE $wpdb->users SET display_name = '$id' WHERE ID = '$user->ID'"); + + if ( !isset( $user->user_idmode ) ): + $idmode = $user->user_idmode; + if ($idmode == 'nickname') $id = $user->user_nickname; + if ($idmode == 'login') $id = $user->user_login; + if ($idmode == 'firstname') $id = $user->user_firstname; + if ($idmode == 'lastname') $id = $user->user_lastname; + if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname; + if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname; + if (!$idmode) $id = $user->user_nickname; + $id = addslashes( $id ); + $wpdb->query("UPDATE $wpdb->users SET display_name = '$id' WHERE ID = '$user->ID'"); + endif; endforeach; $old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname' ); $wpdb->hide_errors();