diff options
author | zotlabs <mike@macgirvin.com> | 2017-11-12 16:07:20 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-11-12 16:07:20 -0800 |
commit | a387868540e931a77e0af9ce706047f40feef021 (patch) | |
tree | 2d3960d326a2a1ef1b62d4d11b40db90d0263235 /view/js/main.js | |
parent | 1ac35dd04748744b22e6fc3dd254f16f7980bd90 (diff) | |
parent | 6ea7ef43e0a0a99f81986c8e1fe5955800bfa496 (diff) | |
download | volse-hubzilla-a387868540e931a77e0af9ce706047f40feef021.tar.gz volse-hubzilla-a387868540e931a77e0af9ce706047f40feef021.tar.bz2 volse-hubzilla-a387868540e931a77e0af9ce706047f40feef021.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/js/main.js')
-rw-r--r-- | view/js/main.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index ffea1b75c..e231dac60 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -959,9 +959,9 @@ function notify_popup_loader(notifyType) { $("." + notifyType + "-update").html(data.notify.length); $(data.notify).each(function() { - html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); + html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid); $("#navbar-" + notifyType + "-menu").append(html); - html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); + html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid); $("#nav-" + notifyType + "-menu").append(html); }); |