diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-12-18 12:46:37 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-12-18 12:47:29 +0100 |
| commit | ab3b126ff6a3dd76292c6c96482ed6835df966f6 (patch) | |
| tree | 586474cb62fdd0ddc9b3e16159be6212042937fb | |
| parent | 6a17da9b0867b90969ec69ba85f6e2291267dea4 (diff) | |
| download | volse-hubzilla-ab3b126ff6a3dd76292c6c96482ed6835df966f6.tar.gz volse-hubzilla-ab3b126ff6a3dd76292c6c96482ed6835df966f6.tar.bz2 volse-hubzilla-ab3b126ff6a3dd76292c6c96482ed6835df966f6.zip | |
notifications: only handle item otype notify_ids
| -rw-r--r-- | Zotlabs/Module/Ping.php | 4 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 3 |
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}} |