--- /home/cvs/contributions/modules/views_bookmark/views_bookmark.module	2006-05-15 12:09:42.000000000 -0400
+++ views_bookmark.module	2006-05-19 21:19:52.000000000 -0400
@@ -96,10 +96,20 @@
 
     if ($bookmarks[$bookmark->vbid]) {
       // already marked
-      $links[] = l($bookmark->unmark, "views_bookmark/unmark/$node->nid/$bookmark->vbid", array('title' => $bookmark->unmark_long));
+      // $links[] = l($bookmark->unmark, "views_bookmark/unmark/$node->nid/$bookmark->vbid", array('title' => $bookmark->unmark_long));
+        $links['bookmark-unmark-' . $bookmark->vbid . '-' . $node->nid] = array(
+          '#title' => $bookmark->unmark, 
+          '#href' => 'views_bookmark/unmark/' . $node->nid . '/' . $bookmark->vbid, 
+          '#attributes' => array('title' => $bookmark->unmark_long)
+        );
     } else {
       // not marked
-      $links[] = l($bookmark->mark, "views_bookmark/mark/$node->nid/$bookmark->vbid", array('title' => $bookmark->mark_long));
+      // $links[] = l($bookmark->mark, "views_bookmark/mark/$node->nid/$bookmark->vbid", array('title' => $bookmark->mark_long));
+        $links['bookmark-mark-' . $bookmark->vbid . '-' . $node->nid] = array(
+          '#title' => $bookmark->mark, 
+          '#href' => 'views_bookmark/mark/' . $node->nid . '/' . $bookmark->vbid, 
+          '#attributes' => array('title' => $bookmark->mark_long)
+        );
     }
   }
   return $links;
@@ -128,7 +138,11 @@
   }
 
   foreach ($marks as $mark) {
-    $ops = theme('links', array(l(t('edit'), "admin/views_bookmark/edit/$mark->vbid"), l(t('delete'), "admin/views_bookmark/delete/$mark->vbid")));
+     // $ops = theme('links', array(l(t('edit'), "admin/views_bookmark/edit/$mark->vbid"), l(t('delete'), "admin/views_bookmark/delete/$mark->vbid")));
+    $ops = theme('links', array(
+						    array('#title' => t('edit'), '#href' => 'admin/views_bookmark/edit/' . $mark->vbid), 
+						    array('#title' => t('delete'), '#href' => 'admin/views_bookmark/delete/' . $mark->vbid),
+						  ));
     $markroles = array();
     foreach (explode(',', $mark->roles) as $rid) {
       $markroles[] = $roles[$rid];
@@ -259,7 +273,7 @@
     db_query("DELETE FROM {views_bookmark_nodetypes} WHERE vbid = %d", $form['vbid']);
   }
   else {
-    $vbid = db_next_id('views_bookmarks_vbid');
+    $vbid = db_next_id('{views_bookmarks_vbid}');
     db_query("INSERT INTO {views_bookmarks} (vbid, title, mark, mark_long, unmark, unmark_long, roles, global, teaser) VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)", $vbid, $form['title'], $form['mark'], $form['mark_long'], $form['unmark'], $form['unmark_long'], implode(',', array_filter($form['roles'])), $form['global'], $form['teaser']);
   }