? .DS_Store
? activity_stream_twitter.patch
Index: activitystream_twitter/activitystream_twitter.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activitystream/activitystream_twitter/activitystream_twitter.module,v
retrieving revision 1.2.2.7
diff -u -p -r1.2.2.7 activitystream_twitter.module
--- activitystream_twitter/activitystream_twitter.module	9 Nov 2009 22:41:49 -0000	1.2.2.7
+++ activitystream_twitter/activitystream_twitter.module	25 Nov 2009 23:17:57 -0000
@@ -29,7 +29,7 @@ function activitystream_twitter_streamap
     if (variable_get('activitystream_twitter_mentions', '1') == 0 && substr($tweet['title'], 0, 1) == '@') {
       continue;
     }
-    $tweet['body'] = activitystream_twitter_makelinks($tweet['body']);
+    $tweet['body'] = theme('activitystream_twitter_makelinks', $tweet['body']);
     $newitems[] = $tweet;
   }
   return $newitems;
@@ -91,7 +91,7 @@ function theme_activitystream_twitter_it
   $node = node_load($activity->nid);
   $date = theme('activitystream_date', $node->created);
   $user = user_load(array('uid' => $node->uid));
-  $linked = activitystream_twitter_makelinks($node->title);
+  $linked = theme('activitystream_twitter_makelinks',$node->title);
   $title = $linked[0];
   // Add twitpic thmbs to the text
   if ($linked[1] != '') {
@@ -101,7 +101,7 @@ function theme_activitystream_twitter_it
    return '<span class="activitystream-item">'. theme('activitystream_twitter_icon') ." <span>$name ". l(t('tweeted'), $activity->link) ." \"". $title ."\" <span class=\"activitystream-created\">$date</span></span> ". l('#', 'node/'. $node->nid, array('class' => 'permalink')) . $pics .'</span>';
 }
 
-function activitystream_twitter_makelinks($text) {
+function theme_activitystream_twitter_makelinks($text) {
   // twitpic images
   preg_match_all("/http:\/\/twitpic\.com\/(.*)/i", $text, $matches, PREG_PATTERN_ORDER);
   foreach ($matches[1] as $match) {
@@ -129,5 +129,8 @@ function activitystream_twitter_theme() 
     'activitystream_twitter_item' => array(
       'arguments' => array('activity' => NULL),
     ),
+    'activitystream_twitter_makelinks' => array(
+      'arguments' => array('body' => NULL),
+    ),
   );
 }