--- uc_wishlist/uc_wishlist.module	2007-10-24 15:43:46.000000000 -0700
+++ uc_wishlist.module	2007-12-19 14:26:03.000000000 -0800
@@ -271,6 +271,13 @@ function uc_wishlist_user($op, &$edit, &
         return array(t('Wish lists') => $items);
       }
       break;
+    case 'delete':
+      $wid = db_result(db_query("SELECT wid FROM {uc_wishlists} WHERE uid = %d", $user->uid));
+      if ($wid) {
+        db_query("DELETE FROM {uc_wishlist_products} WHERE wid = %d", $wid);
+        db_query("DELETE FROM {uc_wishlists} WHERE wid = %d", $wid);
+      }
+      break;
   }
 }
 
@@ -289,7 +296,7 @@ function uc_wishlist_form_alter($form_id
   if (strlen($form_id)>28 && substr($form_id, 0, 27)=='uc_product_add_to_cart_form') {
     $form['wishlist'] = array(
       '#type' => 'submit',
-      '#value' => 'Add to wish list',
+      '#value' => t('Add to wish list'),
     );
     $oldsubmit = array($form['#submit']);
     $form['#submit'] = array('uc_wishlist_add_to_wishlist' => $oldsubmit);
@@ -516,6 +523,9 @@ function uc_wishlist_view() {
   }
 
   if ($own) {
+    if (!$user->uid) {
+      drupal_set_message(t('Save this wishlist to your account by <a href="!url">logging in or creating an account</a>.', array('!url' => url('user'))));
+    }
     require_once(drupal_get_path('module', 'uc_wishlist') . '/uc_wishlist_address_pane.inc');
     drupal_add_js(drupal_get_path('module', 'uc_wishlist') . '/uc_wishlist.js');
     $output .= drupal_get_form('uc_wishlist_settings_form', $wishlist);
@@ -634,8 +644,8 @@ function uc_wishlist_view_table($op, &$f
           $data['remove'][] = array('data' => drupal_render($form['items'][$i]['remove']), 'align' => 'center');
         }
         // TODO this change reflects a recent version of uc_cart
-        //$data['image'][] = array('data' => uc_product_get_picture($nid, 'cart'));
-        $data['image'][] = array('data' => drupal_render($form['items'][$i]['image']));
+        $data['image'][] = array('data' => uc_product_get_picture($nid, 'cart'));
+        //$data['image'][] = array('data' => drupal_render($form['items'][$i]['image']));
         $data['desc'][] = array('data' => $desc, 'width' => '100%');
         $data['wantqty'][] = array('data' => $form['items'][$i]['wantqty'] ? drupal_render($form['items'][$i]['wantqty']) : '');
         $data['haveqty'][] = array('data' => $form['items'][$i]['haveqty'] ? drupal_render($form['items'][$i]['haveqty']) : '');
@@ -695,8 +705,21 @@ function uc_wishlist_view_form_submit($f
  * for customers with wish lists.
  */
 function uc_wishlist_search($form_id = NULL, $form_values = NULL) {
-  $query = arg(2);
-  if ($query = arg(2)) {
+  // Hook into the search module...
+  if ($form_id == 'status' || $form_id == 'reset') {
+    return;
+  }
+  if ($form_id == 'name') {
+    return t('Wish Lists');
+  }
+
+  if ($form_id == 'search') {
+    $query = $form_values;
+  } else {
+    $query = arg(2);
+  }
+
+  if ($query || $form_id == 'search') {
     $match = array();
     // check for user match
     $u = user_load(array('name' => $query));
@@ -736,13 +759,23 @@ function uc_wishlist_search($form_id = N
     }
   }
 
-  if (count($links)>0) {
-    $output = theme_links($links, array());
-  }
-  else {
-    $output = t('No wish lists were found that match your search criteria.');
+  if ($form_id == 'search') {
+    $output = array();
+    foreach ((array) $links as $link) {
+      $output[] = array('link' => $link['href'],
+                        'type' => 'Wish List',
+                         'title' => $link['title']);
+    }
+  } else {
+    if (count($links)>0) {
+      $output = theme_links($links, array());
+    }
+    else {
+      $output = t('No wish lists were found that match your search criteria.');
+    }
+    $output .= drupal_get_form('uc_wishlist_search_form');
   }
-  $output .= drupal_get_form('uc_wishlist_search_form');
+
   return $output;
 }