Index: masquerade.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/masquerade/masquerade.install,v
retrieving revision 1.4.2.2
diff -u -p -r1.4.2.2 masquerade.install
--- masquerade.install	6 Mar 2009 19:58:16 -0000	1.4.2.2
+++ masquerade.install	21 Jul 2009 16:06:03 -0000
@@ -97,4 +97,19 @@ function masquerade_update_6002() {
   db_add_index($ret, 'masquerade', 'sid', array('sid', 'uid_from'));
   db_add_index($ret, 'masquerade', 'sid_2', array('sid', 'uid_as'));
   return $ret;
-}
\ No newline at end of file
+}
+
+/**
+ * Change masquerade_quick_switches variable to store a serialized array of
+ * user ID's. Reverts update 6003.
+ */
+function masquerade_update_6003() {
+  $users = variable_get('masquerade_quick_switches', NULL);
+  if (!empty($users)) {
+    $user_ids = drupal_explode_tags($users);
+    if (!empty($user_ids)) {
+      variable_set('masquerade_quick_switches', $user_ids);
+    }
+  }
+  return array();
+}
Index: masquerade.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/masquerade/masquerade.module,v
retrieving revision 1.16.2.14
diff -u -p -r1.16.2.14 masquerade.module
--- masquerade.module	20 Jun 2009 04:56:14 -0000	1.16.2.14
+++ masquerade.module	21 Jul 2009 16:06:04 -0000
@@ -155,11 +155,16 @@ function masquerade_admin_settings() {
     '#description' => t('Enter the username of an account you wish to switch easily between via a menu item.')
   );
 
+  $quick_switch_users = array();
+  foreach ((variable_get('masquerade_quick_switches', array())) as $uid) {
+    $u = user_load(array('uid' => $uid));
+    $quick_switch_users[] = $u->name;
+  }
   $form['masquerade_quick_switches'] = array(
     '#type' => 'textfield',
     '#title' => t('Block <em>Quick Switch</em> users'),
     '#autocomplete_path' => 'masquerade/autocomplete/multiple',
-    '#default_value' => variable_get('masquerade_quick_switches', ''),
+    '#default_value' => !empty($quick_switch_users) ? implode(', ', $quick_switch_users) : '',
     '#description' => t('Enter the usernames, separated by commas, of accounts to show as quick switch links in the Masquerade block.')
   );
 
@@ -180,13 +185,21 @@ function masquerade_admin_settings_valid
   $masquerade_switches = drupal_explode_tags($form_state['values']['masquerade_quick_switches']);
   foreach ($masquerade_switches as $switch_user) {
     $test_user = user_load(array('name' => $switch_user));
-	if (!$test_user) {
-	  form_set_error('masquerade_quick_switches', t('%user does not exist. Please enter a valid username.', array('%user' => $switch_user)));
-	}
+    if (!$test_user) {
+      form_set_error('masquerade_quick_switches', t('%user does not exist. Please enter a valid username.', array('%user' => $switch_user)));
+    }
   }
 }
 
 function masquerade_admin_settings_submit($form, &$form_state) {
+  // Change user names to user ID's for system_settings_form_submit() to save.
+  $masquerade_switches = drupal_explode_tags($form_state['values']['masquerade_quick_switches']);
+  $masquerade_uids = array();
+  foreach ($masquerade_switches as $masquerade_name) {
+    $u = user_load(array('name' => $masquerade_name));
+    $masquerade_uids[] = $u->uid;
+  }
+  $form_state['values']['masquerade_quick_switches'] = $masquerade_uids;
   menu_rebuild();
 }
 
@@ -266,11 +279,11 @@ function masquerade_block_1($record) {
     $markup_value = t('You are masquerading as:<br />%masq_as', array('%masq_as' => $user->name)) . theme('item_list', $quick_switch_link);
   }
   else {
-	// A comma-separated list of users.
-    $masquerade_switches = drupal_explode_tags(variable_get('masquerade_quick_switches', ''));
+    // A comma-separated list of users.
+    $masquerade_switches = variable_get('masquerade_quick_switches', array());
     foreach ($masquerade_switches as $switch_user) {
-      if ($switch_user != $GLOBALS['user']->name) {
-        $user_name = user_load(array('name' => $switch_user));
+      if ($switch_user != $GLOBALS['user']->uid) {
+        $user_name = user_load(array('uid' => $switch_user));
         if ($user_name->uid) {
           $quick_switch_link[] = l($user_name->name, 'masquerade/switch/'. $user_name->uid);
         }