Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / TwitterBridge / daemons / twitterstatusfetcher.php

diff --git a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index 7860a1fedf3b0d2086c82d4ca714835b17434856..fd3b5765e2a44ad0801ff982aadda848082e3e4d 100644 (file)
--- a/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -128,6 +128,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         return $flinks;
     }
 
+    // FIXME: make it so we can force a Foreign_link here without colliding with parent
     function childTask($flink) {
         // Each child ps needs its own DB connection
 
@@ -149,15 +150,9 @@ class TwitterStatusFetcher extends ParallelizingDaemon
         unset($_DB_DATAOBJECT['CONNECTIONS']);
     }
 
-    function getTimeline($flink, $timelineUri = 'home_timeline')
+    function getTimeline(Foreign_link $flink, $timelineUri = 'home_timeline')
     {
-        if (empty($flink)) {
-            common_log(LOG_ERR, $this->name() .
-                       " - Can't retrieve Foreign_link for foreign ID $fid");
-            return;
-        }
-
-        common_debug($this->name() . ' - Trying to get ' . $timelineUri .
+        common_log(LOG_DEBUG, $this->name() . ' - Trying to get ' . $timelineUri .
                    ' timeline for Twitter user ' . $flink->foreign_id);
 
         $client = null;