Changeset 2641 for trunk/wp-admin/upgrade-functions.php

Timestamp:

06/14/2005 11:22:55 PM (21 years ago)

Author:

ryan

Message:

DB escape fields inserted into usermeta table. Hide errors when dropping old columns from user table.

File:

• trunk/wp-admin/upgrade-functions.php (modified) (3 diffs)

trunk/wp-admin/upgrade-functions.php

@@ -86 +86 @@
     
     // Set user_nicename.
-    $users = $wpdb->get_results("SELECT ID, user_nickname, user_nicename FROM $wpdb->users");
-    foreach ($users as $user) {
-        if ('' == $user->user_nicename) { 
-            $newname = sanitize_title($user->user_nickname);
-            $wpdb->query("UPDATE $wpdb->users SET user_nicename = '$newname' WHERE ID = '$user->ID'");
-        }
-    }
+    // FIXME: user_nickname is no longer in the user table.  Need to update and
+    // move this code to where the new usermeta table is setup.
+//  $users = $wpdb->get_results("SELECT ID, user_nickname, user_nicename FROM $wpdb->users");
+//  foreach ($users as $user) {
+//      if ('' == $user->user_nicename) { 
+//          $newname = sanitize_title($user->user_nickname);
+//          $wpdb->query("UPDATE $wpdb->users SET user_nicename = '$newname' WHERE ID = '$user->ID'");
+//      }
+//  }
 
     $users = $wpdb->get_results("SELECT ID, user_pass from $wpdb->users");
@@ -220 +222 @@
     foreach ( $users as $user ) :
         if ( !empty( $user->user_firstname ) )
-            update_usermeta( $user->ID, 'first_name', $user->user_firstname );
+            update_usermeta( $user->ID, 'first_name', addslashes($user->user_firstname) );
         if ( !empty( $user->user_lastname ) )
-            update_usermeta( $user->ID, 'last_name', $user->user_lastname );
+            update_usermeta( $user->ID, 'last_name', addslashes($user->user_lastname) );
         if ( !empty( $user->user_nickname ) )
-            update_usermeta( $user->ID, 'nickname', $user->user_nickname );
+            update_usermeta( $user->ID, 'nickname', addslashes($user->user_nickname) );
         if ( !empty( $user->user_level ) )
             update_usermeta( $user->ID, $table_prefix . 'user_level', $user->user_level );
         if ( !empty( $user->user_icq ) )
-            update_usermeta( $user->ID, 'icq', $user->user_icq );
+            update_usermeta( $user->ID, 'icq', addslashes($user->user_icq) );
         if ( !empty( $user->user_aim ) )
-            update_usermeta( $user->ID, 'aim', $user->user_aim );
+            update_usermeta( $user->ID, 'aim', addslashes($user->user_aim) );
         if ( !empty( $user->user_msn ) )
-            update_usermeta( $user->ID, 'msn', $user->user_msn );
+            update_usermeta( $user->ID, 'msn', addslashes($user->user_msn) );
         if ( !empty( $user->user_yim ) )
-            update_usermeta( $user->ID, 'yim', $user->user_icq );
+            update_usermeta( $user->ID, 'yim', addslashes($user->user_icq) );
         if ( !empty( $user->user_description ) )
-            update_usermeta( $user->ID, 'description', $user->user_description );
+            update_usermeta( $user->ID, 'description', addslashes($user->user_description) );
         $idmode = $user->user_idmode;
         if ($idmode == 'nickname') $id = $user->user_nickname;
@@ -249 +251 @@
     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();
     foreach ( $old_user_fields as $old )
         $wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+    $wpdb->show_errors();
 }