diff options
| author | Federico Marani <federico.marani@ymail.com> | 2009-03-16 22:43:51 +0000 |
|---|---|---|
| committer | Federico Marani <federico.marani@ymail.com> | 2009-03-16 22:43:51 +0000 |
| commit | 420c3613049bec1360cdeb1f50283b239adf23d3 (patch) | |
| tree | 0ab458b3c45c883232b3ed31addbc2aba1288f6a /lib/twitter.php | |
| parent | bab3e1b8586f42bc1f0a5f96b6990d67c6b74446 (diff) | |
| parent | b3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (diff) | |
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Diffstat (limited to 'lib/twitter.php')
| -rw-r--r-- | lib/twitter.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/twitter.php b/lib/twitter.php index 8a54afb9c..db2092210 100644 --- a/lib/twitter.php +++ b/lib/twitter.php @@ -224,7 +224,6 @@ function is_twitter_bound($notice, $flink) { function broadcast_twitter($notice) { - global $config; $success = true; $flink = Foreign_link::getByUserID($notice->profile_id, @@ -232,7 +231,7 @@ function broadcast_twitter($notice) // XXX: Not sure WHERE to check whether a notice should go to // Twitter. Should we even put in the queue if it shouldn't? --Zach - if (is_twitter_bound($notice, $flink)) { + if (!is_null($flink) && is_twitter_bound($notice, $flink)) { $fuser = $flink->getForeignUser(); $twitter_user = $fuser->nickname; @@ -248,7 +247,7 @@ function broadcast_twitter($notice) CURLOPT_POSTFIELDS => array( 'status' => $statustxt, - 'source' => $config['integration']['source'] + 'source' => common_config('integration', 'source') ), CURLOPT_RETURNTRANSFER => true, CURLOPT_FAILONERROR => true, |