diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-08-25 22:40:06 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-08-25 22:40:06 +0000 |
| commit | 5a6990e078a066c133bc29bfc19dccb66291606e (patch) | |
| tree | 3c3b8040dd16149fd3dd34140dc75f0d957fca3c | |
| parent | 22126298553407221373ece51a10f91aaf7397c6 (diff) | |
When upgrading, only get users of current blog and upgrade them!
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@235 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | wp-inst/wp-admin/upgrade-functions.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/wp-inst/wp-admin/upgrade-functions.php b/wp-inst/wp-admin/upgrade-functions.php index ea58273..bb277db 100644 --- a/wp-inst/wp-admin/upgrade-functions.php +++ b/wp-inst/wp-admin/upgrade-functions.php @@ -11,11 +11,10 @@ function upgrade_all() { upgrade_160(); } - -function upgrade_160() { +function upgrade_160_helper( $users ) { global $wpdb, $table_prefix; - $users = $wpdb->get_results("SELECT * FROM $wpdb->users"); - foreach ( $users as $user ) : + foreach ( $users as $user_details ) : + $user = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE ID = '" . $user_details[ 'user_id' ] . "'"); if ( !empty( $user->user_firstname ) ) update_usermeta( $user->ID, 'first_name', $wpdb->escape($user->user_firstname) ); if ( !empty( $user->user_lastname ) ) @@ -59,6 +58,14 @@ function upgrade_160() { } endforeach; +} + +function upgrade_160() { + global $wpdb, $table_prefix; + $users = $wpdb->get_results("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '{$table_prefix}capabilities'", ARRAY_A); + upgrade_160_helper( $users ); + $users = $wpdb->get_results("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = '{$table_prefix}user_level'", ARRAY_A); + upgrade_160_helper( $users ); $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', 'user_level' ); $wpdb->hide_errors(); foreach ( $old_user_fields as $old ) |