Index: twitter_actions/twitter_actions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/twitter/twitter_actions/twitter_actions.module,v
retrieving revision 1.2
diff -u -p -r1.2 twitter_actions.module
--- twitter_actions/twitter_actions.module	27 May 2009 19:00:08 -0000	1.2
+++ twitter_actions/twitter_actions.module	26 Aug 2010 13:15:01 -0000
@@ -62,7 +62,7 @@ function twitter_actions_set_status_acti
     '#default_value' => $context['message'],
     '#cols' => '80',
     '#rows' => '3',
-    '#description' => t('The message that should be sent. You may include the following variables: %site_name, %username, %node_url, %node_type, %title, %teaser, %body. Not all variables will be available in all contexts.'),
+    '#description' => t('The message that should be sent. You may include the following variables: %site_name, %username, %node_url, %node_type, %title, %teaser, %body, %tinyurl. Not all variables will be available in all contexts.'),
     '#required'      => TRUE,
   );
   return $form;
@@ -170,6 +170,13 @@ function twitter_actions_set_status_acti
     );
   }
 
+  // Only make a tinyurl if it was asked for.
+  if (strstr($context['message'], '%tinyurl') !== FALSE) {
+    $variables = array_merge($variables, array(
+      '%tinyurl' => twitter_shorten_url(url('node/'. $node->nid, array('absolute' => TRUE))),
+    ));
+  }
+
   $message = strtr($context['message'], $variables);
 
   module_load_include('inc', 'twitter');