Merge branch '0.7.x' into 0.8.x

[quix0rs-gnu-social.git] / lib / twitter.php

diff --git a/lib/twitter.php b/lib/twitter.php
index ccc6c93cae00730100cdd984b918ba571891be10..c1d0dc254d8c99dc7ff8bc6a730644ee44e53097 100644 (file)
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -346,7 +346,7 @@ function save_twitter_friends($user, $twitter_id, $screen_name, $password)
 function is_twitter_bound($notice, $flink) {
 
     // Check to see if notice should go to Twitter
-    if ($flink->noticesync & FOREIGN_NOTICE_SEND) {
+    if (!empty($flink) && ($flink->noticesync & FOREIGN_NOTICE_SEND)) {
 
         // If it's not a Twitter-style reply, or if the user WANTS to send replies.
         if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||