--- ./admin_hover.module.orig	2009-01-10 16:53:21.000000000 +0100
+++ ./admin_hover.module	2009-08-18 16:51:03.000000000 +0200
@@ -71,7 +71,7 @@
     $options = array();
     $links = array_filter($admin_hover, '_admin_hover_filter_'. $object);
     foreach ($links as $link) {
-      $options[urlencode($link['href'])] = $link['description'] ? $link['description'] : $link['title'];
+      $options[urlencode($link['href'])] = isset($link['description']) ? $link['description'] : $link['title'];
     }
     $form['admin_hover_active_links']['admin_hover_active_links_'. $object] = array(
       '#type' => 'checkboxes',
@@ -608,7 +608,7 @@
     }
     // check access
     if ($check_access) {
-      $link['access callback'] = $link['access callback'] ? trim($link['access callback']) : 'user_access';
+      $link['access callback'] = empty($link['access callback']) ? 'user_access' : trim($link['access callback']);
       $link['access arguments'] = empty($link['access arguments']) ? array() : $link['access arguments'];
       foreach ($link['access arguments'] as $i => $argument) {
         $link['access arguments'][$i] = isset($map[$argument]) ? $map[$argument] : $argument;
@@ -618,24 +618,29 @@
         continue;
       }
     }
-    // replace path tokens
-    $link['href'] = token_replace($link['href'], 'node', $node);
-    if ('block' == $object) {
-      $link['href'] = str_replace(array_keys($map), array_values($map), $link['href']);
-    }
     // replace title tokens and translate
     $link['title'] = isset($link['title']) ? $link['title'] : '';
-    $link['title'] = token_replace($link['title'], 'node', $node);
-    if (isset($link['title arguments']) && is_array($link['title arguments'])) {
-      foreach ($link['title arguments'] as $sub => $replace) {
-        $link['title arguments'][$sub] = token_replace($replace, 'node', $node);
-      }
-    }
     $link['title callback'] = isset($link['title callback']) ? trim($link['title callback']) : 't';
     $link['title arguments'] = isset($link['title arguments']) ? $link['title arguments'] : array();
     $link['title arguments'] = array($link['title'], $link['title arguments']);
     $link['attributes']['title'] = call_user_func_array($link['title callback'], $link['title arguments']);
     $link['destination'] = isset($link['destination']) ? $link['destination'] : TRUE;
+
+    // replace path tokens
+    switch ($object) {
+      case 'node':
+        $link['href'] = token_replace($link['href'], 'node', $node);
+        $link['title'] = token_replace($link['title'], 'node', $node);
+        if (isset($link['title arguments']) && is_array($link['title arguments'])) {
+          foreach ($link['title arguments'] as $sub => $replace) {
+            $link['title arguments'][$sub] = token_replace($replace, 'node', $node);
+          }
+        }
+        break;
+      case 'block':
+        $link['href'] = str_replace(array_keys($map), array_values($map), $link['href']);
+        break;
+    }
     $admin_hover_links[] = array(
       'title' => '',
       'href' => $link['href'],
