Merge pull request #5719 from annando/notices-yeah

[friendica.git/.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index 145c384..091323d 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -87,10 +87,11 @@ function notifications_content(App $a)
        $perpage = 20;
        $startrec = ($page * $perpage) - $perpage;
 
+       $notif_header = L10n::t('Notifications');
+
        // Get introductions
        if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
                Nav::setSelected('introductions');
-               $notif_header = L10n::t('Notifications');
 
                $all = (($a->argc > 2) && ($a->argv[2] == 'all'));
 
@@ -115,7 +116,6 @@ function notifications_content(App $a)
        } elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
                $notif_header = L10n::t('Home Notifications');
                $notifs = $nm->homeNotifs($show, $startrec, $perpage);
-
        }
 
 
@@ -133,12 +133,8 @@ function notifications_content(App $a)
 
        $notif_tpl = get_markup_template('notifications.tpl');
 
-       if (!isset($notifs['ident'])) {
-               logger('Missing data in notifs: ' . System::callstack(20), LOGGER_DEBUG);
-       }
-
        // Process the data for template creation
-       if ($notifs['ident'] === 'introductions') {
+       if (defaults($notifs, 'ident', '') === 'introductions') {
                $sugg = get_markup_template('suggestions.tpl');
                $tpl = get_markup_template("intros.tpl");
 
@@ -281,7 +277,7 @@ function notifications_content(App $a)
                }
 
        // Normal notifications (no introductions)
-       } else {
+       } elseif (!empty($notifs['notifications'])) {
                // The template files we need in different cases for formatting the content
                $tpl_item_like = 'notifications_likes_item.tpl';
                $tpl_item_dislike = 'notifications_dislikes_item.tpl';