From c0a0710f97d66b695a3c3d1b56d885653d6e14f8 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 21 Jan 2011 12:20:05 -0800 Subject: [PATCH 1/2] incorrect item owner on like/dislike activity body when remote-auth profile --- mod/like.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/like.php b/mod/like.php index cb4093d5d9..f256cd9a1f 100644 --- a/mod/like.php +++ b/mod/like.php @@ -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; From 96620520a8be98204ebc5b3023c6a2db9aa5e540 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 22 Jan 2011 09:20:52 +0100 Subject: [PATCH 2/2] wording in email template adjusted --- view/de/cmnt_received_eml.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/view/de/cmnt_received_eml.tpl b/view/de/cmnt_received_eml.tpl index 2c7ebaa65c..500c93eb48 100644 --- a/view/de/cmnt_received_eml.tpl +++ b/view/de/cmnt_received_eml.tpl @@ -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