aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-04-04 17:43:44 -0700
committerfriendica <info@friendica.com>2014-04-04 17:43:44 -0700
commit32e71cf06b7471923dec37b613da3a044f51f28d (patch)
tree8febf41633daaaf61194aee682039150c06ed75e
parent97f0424b1819394a774d6edd076990b006a0168a (diff)
downloadvolse-hubzilla-32e71cf06b7471923dec37b613da3a044f51f28d.tar.gz
volse-hubzilla-32e71cf06b7471923dec37b613da3a044f51f28d.tar.bz2
volse-hubzilla-32e71cf06b7471923dec37b613da3a044f51f28d.zip
finish "ifpending" connections
-rw-r--r--include/nav.php2
-rw-r--r--mod/connections.php5
2 files changed, 5 insertions, 2 deletions
diff --git a/include/nav.php b/include/nav.php
index 6a28ebe93..a97b434bc 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -162,7 +162,7 @@ EOT;
$nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '','');
- $nav['intros'] = array('connections/pending', t('Connections'), "", t('Connections'));
+ $nav['intros'] = array('connections/ifpending', t('Connections'), "", t('Connections'));
$nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications'));
diff --git a/mod/connections.php b/mod/connections.php
index 99a4d6969..1b5e08cfe 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -225,11 +225,14 @@ function connections_content(&$a) {
$head = t('New');
$pending = true;
nav_set_selected('intros');
+ $a->argv[1] = 'pending';
}
else {
$head = t('All');
$search_flags = 0;
$all = true;
+ $a->argc = 1;
+ unset($a->argv[1]);
}
break;
case 'unconnected':
@@ -341,7 +344,7 @@ function connections_content(&$a) {
intval(ABOOK_FLAG_SELF),
intval(XCHAN_FLAGS_DELETED)
);
- if(count($r)) {
+ if($r) {
$a->set_pager_total($r[0]['total']);
$total = $r[0]['total'];
}