harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

class is a reserved word

Browse Source
This commit is contained in:
friendica 2014-11-10 14:23:06 -08:00
parent 3b74e3c1e1
commit 0b4575a40b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/ping.php
View File

@ -222,7 +222,7 @@ function ping_init(&$a) {
'url' => $zz['url'], 'url' => $zz['url'],
'photo' => $zz['photo'], 'photo' => $zz['photo'],
'when' => relative_date($zz['date']), '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'])) 'message' => strip_tags(bbcode($zz['msg']))
); );
} }
@ -251,7 +251,7 @@ function ping_init(&$a) {
'url' => $zz['xchan_url'], 'url' => $zz['xchan_url'],
'photo' => $zz['xchan_photo_s'], 'photo' => $zz['xchan_photo_s'],
'when' => relative_date($zz['created']), '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'), 'message' => t('sent you a private message'),
); );
} }
@ -302,7 +302,7 @@ function ping_init(&$a) {
'url' => $rr['xchan_url'], 'url' => $rr['xchan_url'],
'photo' => $rr['xchan_photo_s'], 'photo' => $rr['xchan_photo_s'],
'when' => relative_date($rr['abook_created']), 'when' => relative_date($rr['abook_created']),
'class' => ('notify-unseen'), 'hclass' => ('notify-unseen'),
'message' => t('added your channel') 'message' => t('added your channel')
); );
} }
@ -343,7 +343,7 @@ function ping_init(&$a) {
'url' => $rr['xchan_url'], 'url' => $rr['xchan_url'],
'photo' => $rr['xchan_photo_s'], 'photo' => $rr['xchan_photo_s'],
'when' => $when, 'when' => $when,
'class' => ('notify-unseen'), 'hclass' => ('notify-unseen'),
'message' => t('posted an event') 'message' => t('posted an event')
); );
} }

2
version.inc
View File

@ -1 +1 @@
2014-11-09.854 2014-11-10.855

2
view/js/main.js
View File

@ -749,7 +749,7 @@ function updateConvItems(mode,data) {
$("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark); $("#nav-" + notifyType + "-menu").html(notifications_all + notifications_mark);
$(data.notify).each(function() { $(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); $("#nav-" + notifyType + "-menu").append(html);
}); });
$(".dropdown-menu img[data-src]").each(function(i, el){ $(".dropdown-menu img[data-src]").each(function(i, el){