aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-12-18 12:46:37 +0100
committerMario Vavti <mario@mariovavti.com>2017-12-18 12:46:37 +0100
commitfe960d7c28e89240902293ba064d452b92d7d27a (patch)
tree7b24d6b842bda44396060d5ccf88e51ce2796964
parent07b628b6673c31a614d944cd167a6ff280ec6bdc (diff)
downloadvolse-hubzilla-fe960d7c28e89240902293ba064d452b92d7d27a.tar.gz
volse-hubzilla-fe960d7c28e89240902293ba064d452b92d7d27a.tar.bz2
volse-hubzilla-fe960d7c28e89240902293ba064d452b92d7d27a.zip
notifications: only handle item otype notify_ids
-rw-r--r--Zotlabs/Module/Ping.php4
-rw-r--r--view/tpl/notifications_widget.tpl3
2 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index c1bce0d51..a3f6cdfec 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -279,8 +279,8 @@ class Ping extends \Zotlabs\Web\Controller {
'photo' => $tt['photo'],
'when' => relative_date($tt['created']),
'hclass' => (($tt['seen']) ? 'notify-seen' : 'notify-unseen'),
- 'b64mid' => $b64mid,
- 'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : ''),
+ 'b64mid' => (($tt['otype'] == 'item') ? $b64mid : 'undefined'),
+ 'notify_id' => (($tt['otype'] == 'item') ? $tt['id'] : 'undefined'),
'message' => $message
);
}
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 0974045fe..299c07592 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -28,6 +28,9 @@
var path = $(this)[0].pathname.substr(1,7);
var stateObj = { b64mid: b64mid };
+ if(b64mid === 'undefined' && notify_id === 'undefined')
+ return;
+
{{if $module == 'display'}}
history.pushState(stateObj, '', 'display/' + b64mid);
{{/if}}