--- rsvp.module.old	2008-07-16 02:17:40.000000000 +0200
+++ rsvp.module	2008-07-23 11:35:48.000000000 +0200
@@ -1308,7 +1308,7 @@
     $rows = array();
     $header = array(t('Newsletter name'), array('data' => t('Operations')));
 
-    foreach (taxonomy_get_tree(_simplenews_get_vid()) as $term) {
+    foreach (taxonomy_get_tree(variable_get('simplenews_vid', '')) as $term) {
       $rows[] = array(
         $term->name,
         l(t('Add'), 'node/'. $rsvp->nid .'/rsvp/'. $rsvp->rid .'/attendees/simplenews/'. $term->tid, 
@@ -1387,7 +1387,7 @@
  */
 function rsvp_attendees_simplenews($nlid) {
   $subs = "";
-  $query = db_query('SELECT DISTINCT s.mail FROM {simplenews_subscriptions} s INNER JOIN simplenews_snid_tid t ON s.snid = t.snid WHERE t.tid = %d ORDER BY mail ASC', $nlid);
+  $query = db_query('SELECT DISTINCT s.mail FROM {simplenews_subscriptions} s INNER JOIN {simplenews_snid_tid} t ON s.snid = t.snid WHERE t.tid = %d ORDER BY mail ASC', $nlid);
   while ($sub = db_fetch_object($query)) {
     $subs .= $sub->mail ."\r\n";
   }