? facebook_status_tags-576278-X.patch
Index: facebook_status_tags.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/facebook_status/submodules/facebook_status_tags/Attic/facebook_status_tags.module,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 facebook_status_tags.module
--- facebook_status_tags.module	30 Nov 2010 07:20:44 -0000	1.1.2.1
+++ facebook_status_tags.module	26 Jan 2011 20:39:29 -0000
@@ -210,7 +210,7 @@ function facebook_status_tags_get_status
       $pid = array($pid);
     }
     $params = array_merge($params, $pid);
-    $sql .= implode(' OR ', array_fill(0, count($pid), 'fb.pid = %d'));
+    $sql .= implode(' OR ', array_fill(0, count($pid), 'fb.recipient = %d'));
     $sql .= ')';
   }
   elseif ($pid == 0) {
@@ -218,7 +218,7 @@ function facebook_status_tags_get_status
       $uid = array($uid);
     }
     $params = array_merge($params, $uid);
-    $sql .= implode(' OR ', array_fill(0, count($uid), 'fb.uid = %d'));
+    $sql .= implode(' OR ', array_fill(0, count($uid), 'fb.sender = %d'));
     $sql .= ')';
   }
   else {
@@ -230,9 +230,9 @@ function facebook_status_tags_get_status
     }
     $params = array_merge($params, $uid);
     $params = array_merge($params, $pid);
-    $sql .= implode(' OR ', array_fill(0, count($uid), 'fb.uid = %d'));
+    $sql .= implode(' OR ', array_fill(0, count($uid), 'fb.sender = %d'));
     $sql .= ') AND (';
-    $sql .= implode(' OR ', array_fill(0, count($pid), 'fb.pid = %d'));
+    $sql .= implode(' OR ', array_fill(0, count($pid), 'fb.recipient = %d'));
     $sql .= ')';
   }
 
@@ -421,19 +421,19 @@ function facebook_status_tags_popular($t
     );
   }
   if (!$options['include messages to others']) {
-    $restrict .= 'f.uid = f.pid AND ';
+    $restrict .= 'f.sender = f.recipient AND ';
   }
   if (!$options['include self updates']) {
-    $restrict .= 'f.uid <> f.pid AND ';
+    $restrict .= 'f.sender <> f.recipient AND ';
   }
   if ($options['current user only']) {
-    $restrict .= 'f.pid = %d AND ';
+    $restrict .= 'f.recipient = %d AND ';
     $args[] = $GLOBALS['user']->uid;
   }
   $args[] = $type;
   $args[] = $time;
   $result = db_query_range("SELECT COUNT(t.sid) count, t.rid FROM {facebook_status_tags} t INNER JOIN {facebook_status} f ON t.sid = f.sid
-    WHERE ". $restrict ."t.type = '%s' AND f.status_time > %d GROUP BY t.rid ORDER BY count DESC, t.sid DESC", $args, 0, $count);
+    WHERE ". $restrict ."t.type = '%s' AND f.created > %d GROUP BY t.rid ORDER BY count DESC, t.sid DESC", $args, 0, $count);
   $tags = array();
   while ($tag = db_fetch_object($result)) {
     $c = $tag->count;
@@ -588,18 +588,6 @@ function _facebook_status_tags_get_term(
 //=================
 
 /**
- * Implementation of hook_facebook_status_render_components_alter().
- */
-function facebook_status_tags_facebook_status_render_components_alter(&$components, $status) {
-  $status_text = $components['status']['#value'];
-  //$status_text comes in pre-encoded. Temporarily replace the single-quote
-  //character encoding so it doesn't get unintentionally linkified.
-  $status_text = str_replace("'", '&#039;', _facebook_status_tags_filter(str_replace('&#039;', "'", $status_text)));
-  $components['status']['#value'] = $status_text;
-  $components['status']['value'] = $status_text .' ';
-}
-
-/**
  * Implementation of hook_facebook_status_save().
  */
 function facebook_status_tags_facebook_status_save($status, $edit = FALSE) {
@@ -607,7 +595,7 @@ function facebook_status_tags_facebook_s
   if ($edit) {
     db_query("DELETE FROM {facebook_status_tags} WHERE sid = %d", $status->sid);
   }
-  $matches = _facebook_status_tags_filter($status->status, TRUE);
+  $matches = _facebook_status_tags_filter($status->message, TRUE);
   //Users.
   $old_matches = array();
   foreach ($matches['@'] as $account) {
@@ -650,6 +638,16 @@ function facebook_status_tags_facebook_s
   db_query("DELETE FROM {facebook_status_tags} WHERE sid = %d", $sid);
 }
 
+/**
+ * Invoked by FBSS when status message is to be displayed.
+ */
+function facebook_status_tags_facebook_status_alter_message($message) {
+  //$status_text comes in pre-encoded. Temporarily replace the single-quote
+  //character encoding so it doesn't get unintentionally linkified.
+  $message = str_replace("'", '&#039;', _facebook_status_tags_filter(str_replace('&#039;', "'", $message)));
+  return $message;
+}
+
 //===================
 //OTHER INTEGRATIONS.
 //===================