1
0
Fork 0

Merge pull request #7604 from annando/pending-contacts

Display pending contacts in the contact list
This commit is contained in:
Hypolite Petovan 2019-09-09 13:49:51 -04:00 committed by GitHub
commit 91b0f0465f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 52 additions and 11 deletions

View file

@ -98,9 +98,14 @@ function notifications_content(App $a)
if ((($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
Nav::setSelected('introductions');
$id = 0;
if (!empty($a->argv[2]) && intval($a->argv[2]) != 0) {
$id = (int)$a->argv[2];
}
$all = (($a->argc > 2) && ($a->argv[2] == 'all'));
$notifs = $nm->introNotifs($all, $startrec, $perpage);
$notifs = $nm->introNotifs($all, $startrec, $perpage, $id);
// Get the network notifications
} elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {