aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-11-22 20:52:22 +0000
committerMario <mario@mariovavti.com>2019-11-22 20:52:22 +0000
commit73a0866ac4666e615742884a9eb3464c742f787b (patch)
tree49b168f7c270507328f0813fbbcbe673db2f197e /Zotlabs
parentb62eb665c5ad12ec7bde6bace71a0ddbb6aac28d (diff)
downloadvolse-hubzilla-73a0866ac4666e615742884a9eb3464c742f787b.tar.gz
volse-hubzilla-73a0866ac4666e615742884a9eb3464c742f787b.tar.bz2
volse-hubzilla-73a0866ac4666e615742884a9eb3464c742f787b.zip
sse: fix a regression where not all appearances of an notification were looped through and fix format_notify() to not look for the parent item anymore
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Enotify.php13
1 files changed, 1 insertions, 12 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index c1a6c9fdc..bc2710ee1 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -872,19 +872,8 @@ class Enotify {
$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
- $r = q("select thr_parent from item where mid = '%s' and uid = %d limit 1",
- 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 {
- $b64mid = ((strpos($mid, 'b64.') === 0) ? $mid : 'b64.' . base64url_encode($mid));
- }
+ $b64mid = ((strpos($mid, 'b64.') === 0) ? $mid : 'b64.' . base64url_encode($mid));
$x = [
'notify_link' => z_root() . '/notify/view/' . $tt['id'],