Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Roland Häder 2016-12-22 09:03:44 +01:00
commit 4c04a78d1b
19 changed files with 97 additions and 29 deletions

View file

@ -285,8 +285,10 @@ function notifications_content(App &$a) {
'$item_label' => $it['label'],
'$item_link' => $it['link'],
'$item_image' => $it['image'],
'$item_url' => $it['url'],
'$item_text' => htmlentities($it['text']),
'$item_when' => $it['when'],
'$item_ago' => $it['ago'],
'$item_seen' => $it['seen'],
));
}