? mailchimp/.svn
Index: mailchimp/mailchimp.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailchimp/mailchimp.module,v
retrieving revision 1.2.2.1.2.3.2.7
diff -u -p -r1.2.2.1.2.3.2.7 mailchimp.module
--- mailchimp/mailchimp.module	7 Apr 2009 16:55:16 -0000	1.2.2.1.2.3.2.7
+++ mailchimp/mailchimp.module	6 Jul 2009 21:52:18 -0000
@@ -603,7 +603,7 @@ function mailchimp_mailchimp_merge_keys(
   }
 
   if (function_exists('token_get_list')) {
-    $tokens = token_get_list('user');
+    $tokens = token_get_list(array('user', 'order'));
     foreach ($tokens['user'] as $token => $name) {
       $out['token_'. $token] = t('Token: !field', array('!field' => $name));
     }
@@ -752,7 +752,7 @@ function _mailchimp_get_available_lists(
       if (!empty($list)) {
         foreach ((array)$user->roles as $rid => $info) {
           if (variable_get('mailchimp_list_'. $list['id'] .'_role_'. $rid, 0)) {
-            $lists[] = $list;
+            $lists[$list['id']] = $list;
           }
         }
       }