diff options
author | Mario Vavti <mario@mariovavti.com> | 2019-08-13 09:46:01 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2019-08-13 09:46:01 +0200 |
commit | e8f3b7f8530c69045dcabffecab2f158d0b35214 (patch) | |
tree | e02872bbb9a7226f30f78a1784fae113431eceaa /Zotlabs/Module/Ping.php | |
parent | 892e9cd835612c8155bf3c15436137f94abbb667 (diff) | |
parent | e28341ca4beb1b746a5c17590f62c02cc8df49ba (diff) | |
download | volse-hubzilla-4.4.tar.gz volse-hubzilla-4.4.tar.bz2 volse-hubzilla-4.4.zip |
Merge branch '4.4RC'4.4
Diffstat (limited to 'Zotlabs/Module/Ping.php')
-rw-r--r-- | Zotlabs/Module/Ping.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 3dabe0f7b..6e8042eaf 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -282,8 +282,8 @@ class Ping extends \Zotlabs\Web\Controller { if(strpos($message, $tt['xname']) === 0) $message = substr($message, strlen($tt['xname']) + 1); - $mid = basename($tt['link']); + $mid = ((strpos($mid, 'b64.') === 0) ? @base64url_decode(substr($mid, 4)) : $mid); if(in_array($tt['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) { // we need the thread parent @@ -291,7 +291,6 @@ class Ping extends \Zotlabs\Web\Controller { dbesc($mid), intval(local_channel()) ); - $b64mid = ((strpos($r[0]['thr_parent'], 'b64.') === 0) ? $r[0]['thr_parent'] : 'b64.' . base64url_encode($r[0]['thr_parent'])); } else { |