diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-12-14 11:11:57 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-12-14 11:11:57 +0100 |
| commit | 7822257e1ce003300ca9477bbfbfae9c76bb75a4 (patch) | |
| tree | 11ef892afdc1ed1c3687688618f2a6f1934fd759 /Zotlabs | |
| parent | 88140002e79ca1e9d5376456b6349e6b313bcb97 (diff) | |
| parent | b37165c62b1037e504d4b68a507241acf97ede5e (diff) | |
| download | volse-hubzilla-7822257e1ce003300ca9477bbfbfae9c76bb75a4.tar.gz volse-hubzilla-7822257e1ce003300ca9477bbfbfae9c76bb75a4.tar.bz2 volse-hubzilla-7822257e1ce003300ca9477bbfbfae9c76bb75a4.zip | |
Merge branch 'dev'
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/ActivityStreams.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Sse_bs.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/ActivityStreams.php b/Zotlabs/Lib/ActivityStreams.php index fa38c569e..09e1679ac 100644 --- a/Zotlabs/Lib/ActivityStreams.php +++ b/Zotlabs/Lib/ActivityStreams.php @@ -285,7 +285,7 @@ class ActivityStreams { if (!$s) { return false; } - return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact'])); + return (in_array($s, ['Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'TentativeReject', 'emojiReaction', 'EmojiReaction', 'EmojiReact'])); } /** diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php index eaaeae7b7..3a13b0a6f 100644 --- a/Zotlabs/Module/Sse_bs.php +++ b/Zotlabs/Module/Sse_bs.php @@ -124,7 +124,7 @@ class Sse_bs extends Controller { $str = ''; foreach($arr as $a) { - $mids[] = '\'' . dbesc(@base64url_decode(substr($a,4))) . '\''; + $mids[] = '\'' . dbesc(unpack_link_id($a)) . '\''; } $str = implode(',', $mids); |