mirror of
https://github.com/friendica/friendica
synced 2024-12-23 14:00:15 +00:00
Merge branch 'master' of git://github.com/tobiasd/friendika
This commit is contained in:
commit
0dc7e0975a
2 changed files with 2 additions and 3 deletions
|
@ -150,7 +150,7 @@ EOT;
|
|||
$arr['author-link'] = $contact['url'];
|
||||
$arr['author-avatar'] = $contact['thumb'];
|
||||
$arr['body'] = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . ' ' . t('likes') . ' '
|
||||
. '[url=' . $owner['url'] . ']' . $owner['name'] . t('\'s') . '[/url]' . ' '
|
||||
. '[url=' . $item['author-link'] . ']' . $item['author-name'] . t('\'s') . '[/url]' . ' '
|
||||
. '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]' ;
|
||||
|
||||
$arr['verb'] = $activity;
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
|
||||
Hallo $username,
|
||||
|
||||
'$from' hat ein Ding oder eine Konversation kommentiert welchem/r du
|
||||
auch folgst.
|
||||
'$from' hat einen Pinnwandeintrag kommentiert dem du auch folgst.
|
||||
|
||||
-----
|
||||
$body
|
||||
|
|
Loading…
Reference in a new issue