eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'refs/merge-requests/2227' of git://gitorious.org/statusnet/mainline into merge-requests/2227

This commit is contained in:
Evan Prodromou 2012-01-26 11:03:04 -05:00
parent 23bafaba26 184290b5cf
commit f21f09f8b8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/TwitterBridge/TwitterBridgePlugin.php
View File

@ -339,7 +339,7 @@ class TwitterBridgePlugin extends Plugin
$versions[] = array( $versions[] = array(
'name' => 'TwitterBridge', 'name' => 'TwitterBridge',
'version' => self::VERSION, 'version' => self::VERSION,
'author' => 'Zach Copley, Julien C', 'author' => 'Zach Copley, Julien C, Jean Baptiste Favre',
'homepage' => 'http://status.net/wiki/Plugin:TwitterBridge', 'homepage' => 'http://status.net/wiki/Plugin:TwitterBridge',
// TRANS: Plugin description. // TRANS: Plugin description.
'rawdescription' => _m('The Twitter "bridge" plugin allows integration ' . 'rawdescription' => _m('The Twitter "bridge" plugin allows integration ' .

6
plugins/TwitterBridge/twitter.php
View File

@ -120,9 +120,9 @@ function is_twitter_bound($notice, $flink) {
// If it's not a Twitter-style reply, or if the user WANTS to send replies, // If it's not a Twitter-style reply, or if the user WANTS to send replies,
// or if it's in reply to a twitter notice // or if it's in reply to a twitter notice
if (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) || if ( (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY) ||
(($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY) || (is_twitter_notice($notice->reply_to) || is_twitter_notice($notice->repeat_of)) ||
is_twitter_notice($notice->reply_to)) { (empty($notice->reply_to) && !preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content)) ){
return true; return true;
} }
} }