harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not double encode already encoded mid

Browse Source
This commit is contained in:
Mario Vavti 2017-11-19 20:37:58 +01:00
parent 0aa01740d1
commit 727b49c8ab
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Zotlabs/Module/Ping.php
View File

@ -267,6 +267,11 @@ class Ping extends \Zotlabs\Web\Controller {
if(strpos($message, $tt['xname']) === 0) if(strpos($message, $tt['xname']) === 0)
$message = substr($message, strlen($tt['xname']) + 1); $message = substr($message, strlen($tt['xname']) + 1);
$mid = basename($tt['link']);
$b64mid = ((strpos($mid, 'b64.' === 0)) ? $mid : 'b64.' . base64url_encode($mid));
$notifs[] = array( $notifs[] = array(
'notify_link' => z_root() . '/notify/view/' . $tt['id'], 'notify_link' => z_root() . '/notify/view/' . $tt['id'],
'name' => $tt['xname'], 'name' => $tt['xname'],
@ -274,7 +279,7 @@ class Ping extends \Zotlabs\Web\Controller {
'photo' => $tt['photo'], 'photo' => $tt['photo'],
'when' => relative_date($tt['created']), 'when' => relative_date($tt['created']),
'hclass' => (($tt['seen']) ? 'notify-seen' : 'notify-unseen'), 'hclass' => (($tt['seen']) ? 'notify-seen' : 'notify-unseen'),
'b64mid' => 'b64.' . base64url_encode(basename($tt['link'])), 'b64mid' => $b64mid,
'notify_id' => $tt['id'], 'notify_id' => $tt['id'],
'message' => $message 'message' => $message
); );