From afe4cc8bfa01017f3dfc1f40892b78f125c596f9 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 20 Apr 2011 04:50:12 -0700 Subject: pull request #91 fabrixxm (manual merge) --- mod/dfrn_confirm.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mod/dfrn_confirm.php') diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 58473146d..7c28bf902 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -423,9 +423,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; $arr['verb'] = ACTIVITY_FRIEND; $arr['object-type'] = ACTIVITY_OBJ_PERSON; - $arr['body'] = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url] ' . t('is now friends with') - . ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . "\n\n\n" - . ' [url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]'; + + $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]'; + $B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'; + $BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]'; + $arr['body'] = sprintf(t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto; $arr['object'] = '' . ACTIVITY_OBJ_PERSON . '' . $contact['name'] . '' . '' . $contact['url'] . '/' . $contact['name'] . ''; -- cgit v1.2.3