From 0b4575a40b5412f0497c50560b0510a304599086 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 10 Nov 2014 14:23:06 -0800 Subject: class is a reserved word --- mod/ping.php | 8 ++++---- version.inc | 2 +- view/js/main.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mod/ping.php b/mod/ping.php index 98584cb14..e52c162ec 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -222,7 +222,7 @@ function ping_init(&$a) { 'url' => $zz['url'], 'photo' => $zz['photo'], 'when' => relative_date($zz['date']), - 'class' => (($zz['seen']) ? 'notify-seen' : 'notify-unseen'), + 'hclass' => (($zz['seen']) ? 'notify-seen' : 'notify-unseen'), 'message' => strip_tags(bbcode($zz['msg'])) ); } @@ -251,7 +251,7 @@ function ping_init(&$a) { 'url' => $zz['xchan_url'], 'photo' => $zz['xchan_photo_s'], 'when' => relative_date($zz['created']), - 'class' => (($zz['mail_flags'] & MAIL_SEEN) ? 'notify-seen' : 'notify-unseen'), + 'hclass' => (($zz['mail_flags'] & MAIL_SEEN) ? 'notify-seen' : 'notify-unseen'), 'message' => t('sent you a private message'), ); } @@ -302,7 +302,7 @@ function ping_init(&$a) { 'url' => $rr['xchan_url'], 'photo' => $rr['xchan_photo_s'], 'when' => relative_date($rr['abook_created']), - 'class' => ('notify-unseen'), + 'hclass' => ('notify-unseen'), 'message' => t('added your channel') ); } @@ -343,7 +343,7 @@ function ping_init(&$a) { 'url' => $rr['xchan_url'], 'photo' => $rr['xchan_photo_s'], 'when' => $when, - 'class' => ('notify-unseen'), + 'hclass' => ('notify-unseen'), 'message' => t('posted an event') ); } diff --git a/version.inc b/version.inc index 2859cdc11..7bd986426 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-11-09.854 +2014-11-10.855 diff --git a/view/js/main.js b/view/js/main.js index beedb7f01..a55b8fbb1 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -749,7 +749,7 @@ function updateConvItems(mode,data) { $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); $(data.notify).each(function() { - html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.class); + html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); $("#nav-" + notifyType + "-menu").append(html); }); $(".dropdown-menu img[data-src]").each(function(i, el){ -- cgit v1.2.3