diff -r f0e13238cdf7 sites/all/modules/contrib/tweet/tweet.module
--- tweet/tweet.module	Wed Feb 02 13:32:27 2011 +0100
+++ tweet/tweet.module	Wed Feb 02 13:35:58 2011 +0100
@@ -20,31 +20,6 @@
 }
 
 /**
- * Implements hook_link().
- */
-function tweet_link($type, $node = NULL, $teaser = FALSE) {
-  $types = variable_get('tweet_types', _tweet_node_types());
-  if ($type == 'node'
-      && (in_array($node->type, $types) || empty($types))
-      && !_tweet_exclude($node->nid)) {
-    $title = variable_get('tweet_title', 1);
-    if (!$teaser) {
-      $link_type = variable_get('tweet_node', 'icon');
-    }
-    else {
-      $link_type = variable_get('tweet_teaser', 'none');
-    }
-    if ($link_type != 'none') {
-      $links = array();
-      foreach (tweet_sites(TRUE) as $site => $info) {
-        $links['tweet_' . $site] = _tweet_to_twitter($site, $link_type, '', $node->nid);
-      }
-      return $links;
-    }
-  }
-}
-
-/**
  * Implements hook_menu().
  */
 function tweet_menu() {
@@ -61,6 +36,34 @@
 }
 
 /**
+ * Implements hook_node_view().
+ */
+function tweet_node_view($node, $view_mode) {
+  $types = variable_get('tweet_types', _tweet_node_types());
+  if ((in_array($node->type, $types) || empty($types)) && !_tweet_exclude($node->nid)) {
+    if ($view_mode == 'full') {
+      $link_type = variable_get('tweet_node', 'icon');
+    }
+    else {
+      $link_type = variable_get('tweet_teaser', 'none');
+    }
+
+    if ($link_type != 'none') {
+      $links = array();
+      foreach (tweet_sites(TRUE) as $site => $info) {
+        $links['tweet_' . $site] = _tweet_to_twitter($site, $link_type, '', $node->nid);
+      }
+
+      $node->content['links']['tweet'] = array(
+        '#theme' => 'links',
+        '#links' => $links,
+        '#attributes' => array('class' => array('links', 'inline')),
+      );
+    }
+  }
+}
+
+/**
  * Implements hook_block_info().
  */
 function tweet_block_info() {