Index: mailchimp.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailchimp/Attic/mailchimp.admin.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 mailchimp.admin.inc
--- mailchimp.admin.inc	29 Jun 2010 00:07:21 -0000	1.1.2.1
+++ mailchimp.admin.inc	8 Nov 2010 02:46:12 -0000
@@ -35,7 +35,7 @@ function mailchimp_admin_settings() {
             '#tree'         => TRUE
         );
         foreach ($lists as $list) {
-          $saved_list = unserialize(variable_get('mailchimp_lists', NULL));
+          $saved_list = variable_get('mailchimp_lists', NULL);
           $saved_list = $saved_list[$list['id']];
 
           $form['mailchimp_lists']['mailchimp_list_'. $list['id']] = array(
@@ -247,5 +247,5 @@ function mailchimp_admin_settings_valida
 
   // remove lists from the form_state
   unset($form_state['values']['mailchimp_lists']);
-  variable_set('mailchimp_lists', serialize($lists));
+  variable_set('mailchimp_lists', $lists);
 }
Index: mailchimp.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailchimp/Attic/mailchimp.install,v
retrieving revision 1.1.2.8
diff -u -p -r1.1.2.8 mailchimp.install
--- mailchimp.install	11 Jun 2010 16:20:47 -0000	1.1.2.8
+++ mailchimp.install	8 Nov 2010 02:46:12 -0000
@@ -84,6 +84,27 @@ function mailchimp_update_6202() {
 }
 
 /**
+ * Implementation of hook_update_N().
+ *
+ * Convert 'mailchimp_lists' to a normal array.
+ */
+function mailchimp_update_6203() {
+  $ret = array();
+  
+  $var = variable_get('mailchimp_lists', array());
+  if (is_array($var)) {
+    $ret[] = array('success' => TRUE, 'query' => "The 'mailchimp_lists' variable has already been fixed.");
+  }
+  else {
+    $var = unserialize($var);
+    variable_set('mailchimp_lists', $var);
+    $ret[] = array('success' => TRUE, 'query' => "The 'mailchimp_lists' variable has been fixed.");
+  }
+  
+  return $ret;
+}
+
+/**
  * Implementation of hook_uninstall().
  */
 function mailchimp_uninstall() {
Index: mailchimp.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailchimp/mailchimp.module,v
retrieving revision 1.2.2.1.2.3.2.8.2.73
diff -u -p -r1.2.2.1.2.3.2.8.2.73 mailchimp.module
--- mailchimp.module	21 Oct 2010 16:53:10 -0000	1.2.2.1.2.3.2.8.2.73
+++ mailchimp.module	8 Nov 2010 02:46:12 -0000
@@ -830,7 +830,7 @@ function mailchimp_get_merge_values($uid
  */
 function _mailchimp_load_user_list_mergevars($uid, $list_id, $mergevars) {
   $account = mailchimp_get_merge_values($uid);
-  $lists = unserialize(variable_get('mailchimp_lists', array()));
+  $lists = variable_get('mailchimp_lists', array());
   $list = $lists[$list_id];
 
   $uservars = array(
@@ -921,7 +921,6 @@ function _mailchimp_get_available_lists(
   $all_lists = variable_get('mailchimp_lists', array());
   $available_lists = array();
   if (!empty($all_lists)) {
-    $all_lists = unserialize($all_lists);
     foreach ($all_lists as $key => $list) {
       foreach ($user->roles as $rid => $info) {
         if (!empty($list->roles[$rid])) {
@@ -939,10 +938,11 @@ function _mailchimp_get_available_lists(
  * Get all of the lists that the given user must be subscribed to
  */
 function _mailchimp_get_required_lists() {
-  $data = variable_get('mailchimp_lists', NULL);
-  $lists = array();
-  if (!empty($data)) {
-    $lists = unserialize($data);
+  $lists = variable_get('mailchimp_lists', array());
+  if (!is_array($lists)) {
+    $lists = array();
+  }
+  elseif (!empty($lists)) {
     foreach ($lists as $key => $list) {
       if ($list->listtype !== MAILCHIMP_LISTTYPE_REQUIRED) {
         unset($lists[$key]);
@@ -978,7 +978,6 @@ function mailchimp_block($op='list', $de
     $blocks = array();
     $all_lists = variable_get('mailchimp_lists', array());
     if (!empty($all_lists)) {
-      $all_lists = unserialize($all_lists);
       foreach ($all_lists as $key => $list) {
         // exclude required lists
         if ($list->listtype !== MAILCHIMP_LISTTYPE_REQUIRED) {