Mats Sjöberg's merge request no.5 from Gitorious
This commit is contained in:
commit
78781050b3
|
@ -121,7 +121,8 @@ 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 ( (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY) ||
|
if ( (($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) || is_twitter_notice($notice->repeat_of))
|
||||||
|
&& (($flink->noticesync & FOREIGN_NOTICE_RECV) == FOREIGN_NOTICE_RECV)) ||
|
||||||
(empty($notice->reply_to) && !preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content)) ){
|
(empty($notice->reply_to) && !preg_match('/^@[a-zA-Z0-9_]{1,15}\b/u', $notice->content)) ){
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user