Merge branch 'nightly' of gitorious.org:social/mainline into nightly

[quix0rs-gnu-social.git] / plugins / TwitterBridge / scripts / streamtest.php

diff --git a/plugins/TwitterBridge/scripts/streamtest.php b/plugins/TwitterBridge/scripts/streamtest.php
index 800d8c1e1cef9043fe5cca1de83924ac9c153281..dc427a19fa1f73314676bb5dafba9812f83f8e42 100644 (file)
--- a/plugins/TwitterBridge/scripts/streamtest.php
+++ b/plugins/TwitterBridge/scripts/streamtest.php
@@ -43,7 +43,7 @@ data as it comes.
 
 ENDOFHELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 require_once dirname(dirname(__FILE__)) . '/lib/jsonstreamreader.php';
 require_once dirname(dirname(__FILE__)) . '/lib/twitterstreamreader.php';
 
@@ -170,11 +170,7 @@ $stream->hookEvent('status', function($data, $context) {
         $importer = new TwitterImport();
         printf("\timporting...");
         $notice = $importer->importStatus($data);
-        if ($notice) {
-            global $myuser;
-            Inbox::insertNotice($myuser->id, $notice->id);
-            printf(" %s\n", $notice->id);
-        } else {
+        if (!$notice instanceof Notice) {
             printf(" FAIL\n");
         }
     }