Merge pull request #5758 from MrPetovan/bug/fix-empty-notifications
Fix introductions notifications links
This commit is contained in:
commit
f3a97a0828
|
@ -132,6 +132,11 @@ function notifications_content(App $a)
|
||||||
|
|
||||||
$notif_tpl = get_markup_template('notifications.tpl');
|
$notif_tpl = get_markup_template('notifications.tpl');
|
||||||
|
|
||||||
|
$notif_show_lnk = [
|
||||||
|
'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
|
||||||
|
'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
|
||||||
|
];
|
||||||
|
|
||||||
// Process the data for template creation
|
// Process the data for template creation
|
||||||
if (defaults($notifs, 'ident', '') === 'introductions') {
|
if (defaults($notifs, 'ident', '') === 'introductions') {
|
||||||
$sugg = get_markup_template('suggestions.tpl');
|
$sugg = get_markup_template('suggestions.tpl');
|
||||||
|
@ -303,11 +308,6 @@ function notifications_content(App $a)
|
||||||
$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
|
$notif_nocontent = L10n::t('No more %s notifications.', $notifs['ident']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$notif_show_lnk = [
|
|
||||||
'href' => ($show ? 'notifications/' . $notifs['ident'] : 'notifications/' . $notifs['ident'] . '?show=all' ),
|
|
||||||
'text' => ($show ? L10n::t('Show unread') : L10n::t('Show all')),
|
|
||||||
];
|
|
||||||
|
|
||||||
$o .= replace_macros($notif_tpl, [
|
$o .= replace_macros($notif_tpl, [
|
||||||
'$notif_header' => $notif_header,
|
'$notif_header' => $notif_header,
|
||||||
'$tabs' => $tabs,
|
'$tabs' => $tabs,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user