Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
@@ -658,6 +658,9 @@ function common_valid_profile_tag($str)
|
||||
function common_at_link($sender_id, $nickname)
|
||||
{
|
||||
$sender = Profile::staticGet($sender_id);
|
||||
if (!$sender) {
|
||||
return $nickname;
|
||||
}
|
||||
$recipient = common_relative_profile($sender, common_canonical_nickname($nickname));
|
||||
if ($recipient) {
|
||||
$user = User::staticGet('id', $recipient->id);
|
||||
|
||||
Reference in New Issue
Block a user