Merge pull request #7726 from tobiasd/20191010-uexport

[friendica.git] / mod / notifications.php

diff --git a/mod/notifications.php b/mod/notifications.php
index b60c604fc9950c5425c0c0788382f52f7683a5a7..88972728cb7ca63b213700997efc2adc9542b3ab 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -78,7 +78,7 @@ function notifications_content(App $a)
        }
 
        $page = ($_REQUEST['page'] ?? 0) ?: 1;
-       $show =  $_REQUEST['show'] ?? 0;
+       $show = ($_REQUEST['show'] ?? '') === 'all';
 
        Nav::setSelected('notifications');
 
@@ -112,27 +112,27 @@ function notifications_content(App $a)
 
                $all = (($a->argc > 2) && ($a->argv[2] == 'all'));
 
-               $notifs = $nm->getIntroNotifies($all, $startrec, $perpage, $id);
+               $notifs = $nm->getIntroList($all, $startrec, $perpage, $id);
 
        // Get the network notifications
        } elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {
                $notif_header = L10n::t('Network Notifications');
-               $notifs = $nm->getNetworkNotifies($show, $startrec, $perpage);
+               $notifs = $nm->getNetworkList($show, $startrec, $perpage);
 
        // Get the system notifications
        } elseif (($a->argc > 1) && ($a->argv[1] == 'system')) {
                $notif_header = L10n::t('System Notifications');
-               $notifs = $nm->getSystemNotifies($show, $startrec, $perpage);
+               $notifs = $nm->getSystemList($show, $startrec, $perpage);
 
        // Get the personal notifications
        } elseif (($a->argc > 1) && ($a->argv[1] == 'personal')) {
                $notif_header = L10n::t('Personal Notifications');
-               $notifs = $nm->getPersonalNotifies($show, $startrec, $perpage);
+               $notifs = $nm->getPersonalList($show, $startrec, $perpage);
 
        // Get the home notifications
        } elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
                $notif_header = L10n::t('Home Notifications');
-               $notifs = $nm->getHomeNotifies($show, $startrec, $perpage);
+               $notifs = $nm->getHomeList($show, $startrec, $perpage);
        // fallback - redirect to main page
        } else {
                $a->internalRedirect('notifications');