From 320b6b924659f2043edfb6fcf9c1ef44d080a1cb Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 4 Apr 2020 17:53:48 +0000 Subject: [PATCH 1/2] AP: Limited comment distribution --- src/Protocol/ActivityPub/Transmitter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index 837e81c1e9..ecda2dc683 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -478,7 +478,7 @@ class Transmitter $data['to'][] = $profile['url']; } else { $data['cc'][] = $profile['url']; - if (($item['private'] != Item::PRIVATE) && $item['private'] && !empty($actor_profile['followers'])) { + if (($item['private'] != Item::PRIVATE) && !empty($actor_profile['followers'])) { $data['cc'][] = $actor_profile['followers']; } } From e7ce2bfd8220ac229c2d322c8dd929fb687b8d97 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 5 Apr 2020 13:26:22 +0000 Subject: [PATCH 2/2] Fix weird call to "l10n" --- view/lang/fr/strings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/lang/fr/strings.php b/view/lang/fr/strings.php index 9dbc8dd35d..3efc67b312 100644 --- a/view/lang/fr/strings.php +++ b/view/lang/fr/strings.php @@ -117,7 +117,7 @@ $a->strings["a private message"] = "un message privé"; $a->strings["%1\$s sent you %2\$s."] = "%1\$s vous a envoyé %2\$s."; $a->strings["Please visit %s to view and/or reply to your private messages."] = "Merci de visiter %s pour voir vos messages privés et/ou y répondre."; $a->strings["%1\$s replied to you on %2\$s's %3\$s %4\$s"] = ""; -$a->strings["$l10n->t(%1\$s tagged you on %2\$s's %3\$s %4\$s"] = ""; +$a->strings["%1\$s tagged you on %2\$s's %3\$s %4\$s"] = ""; $a->strings["%1\$s commented on %2\$s's %3\$s %4\$s"] = ""; $a->strings["%1\$s replied to you on your %2\$s %3\$s"] = ""; $a->strings["%1\$s tagged you on your %2\$s %3\$s"] = "";