Fix precedence issue causing all replies to be sent to Twitter. Fix #3386

This commit is contained in:
Jean Baptiste Favre 2011-12-13 20:30:03 +01:00
parent 0760c64264
commit ac5e29de5a

View File

@ -116,12 +116,12 @@ function is_twitter_bound($notice, $flink) {
} }
// Check to see if notice should go to Twitter // Check to see if notice should go to Twitter
if (!empty($flink) && ($flink->noticesync & FOREIGN_NOTICE_SEND == FOREIGN_NOTICE_SEND)) { if (!empty($flink) && (($flink->noticesync & FOREIGN_NOTICE_SEND) == FOREIGN_NOTICE_SEND)) {
// 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 (!preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
($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->reply_to)) {
return true; return true;
} }