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.56
diff -u -p -r1.2.2.1.2.3.2.8.2.56 mailchimp.module
--- mailchimp.module	20 May 2010 23:30:38 -0000	1.2.2.1.2.3.2.8.2.56
+++ mailchimp.module	26 May 2010 23:36:46 -0000
@@ -1107,7 +1107,14 @@ function _mailchimp_get_api_object() {
  */
 function mailchimp_block($op='list', $delta=0) {
   if ($op == "list") {
-    $block[0]["info"] = t("Mailchimp Subscription Form");
+      global $user;
+	  $lists =_mailchimp_get_available_lists($user);
+	  for($d = 0; $d < count($lists); $d++){
+	  	$list = $lists[$d];
+		// if more than one newsletter, add a title to separate them
+		$block[$d]["info"] = t("Mailchimp Subscription Form").': '.$list->name;
+	  }
+    
   }
   else if ($op == 'view') {
     // don't show on the subscription page to avoid conflicts
@@ -1121,21 +1128,13 @@ function mailchimp_block($op='list', $de
       else{
         if ($q = _mailchimp_get_api_object()) {
           $lists =_mailchimp_get_available_lists($user);
-          $count = count($lists);
-          foreach ($lists as $list) {
-            // if more than one newsletter, add a title to separate them
-            $title = '';
-            if($count > 1){
-              $title = '<h3 class="mailchimp-list-title">'. $list->name .'</h3>';
-            }
-            $ret .= '<div id="mailchimp-block-list-'. $list->id .'">'. $title .
-              drupal_get_form('mailchimp_subscribe_anon_form', $list, $q) .'</div>';
-          }
-
-          // if only single newsletter, set block title to its name
-          if($count == 1){
+          if(isset($lists[$delta])){
+		    // Get list form for specified block
+	  		$list = $lists[$delta];
             $subject = t('Subscribe to the @title newsletter', array('@title' => $list->name));
-          }
+            $ret .= drupal_get_form('mailchimp_subscribe_anon_form', $list, $q);
+		  	
+		  }
         }
       }
       $block['subject'] = $subject;
@@ -1144,3 +1143,4 @@ function mailchimp_block($op='list', $de
   }
   return $block;
 }
+