diff options
author | zotlabs <mike@macgirvin.com> | 2017-07-21 16:20:50 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-07-21 16:20:50 -0700 |
commit | 992f8272d38b9ee73cc9facbe473665713f6ff2d (patch) | |
tree | 7f9b8e747c4694651bad51632345e6fa440258a4 /Zotlabs/Module/Connections.php | |
parent | 89d21c08735ad9bb151acee5ee1f372a803e2213 (diff) | |
parent | 27678a523c4c02bf4e3b31bf4ac01413feaf3759 (diff) | |
download | volse-hubzilla-992f8272d38b9ee73cc9facbe473665713f6ff2d.tar.gz volse-hubzilla-992f8272d38b9ee73cc9facbe473665713f6ff2d.tar.bz2 volse-hubzilla-992f8272d38b9ee73cc9facbe473665713f6ff2d.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs/Module/Connections.php')
-rw-r--r-- | Zotlabs/Module/Connections.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php index b3c5e8ee9..6ad1e9528 100644 --- a/Zotlabs/Module/Connections.php +++ b/Zotlabs/Module/Connections.php @@ -29,6 +29,8 @@ class Connections extends \Zotlabs\Web\Controller { notice( t('Permission denied.') . EOL); return login(); } + + nav_set_selected(t('Connections')); $blocked = false; $hidden = false; @@ -71,7 +73,6 @@ class Connections extends \Zotlabs\Web\Controller { $search_flags = " and abook_pending = 1 "; $head = t('New'); $pending = true; - nav_set_selected('intros'); break; case 'ifpending': $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash where abook_channel = %d and abook_pending = 1 and abook_self = 0 and abook_ignored = 0 and xchan_deleted = 0 and xchan_orphan = 0 ", @@ -81,7 +82,6 @@ class Connections extends \Zotlabs\Web\Controller { $search_flags = " and abook_pending = 1 "; $head = t('New'); $pending = true; - nav_set_selected('intros'); \App::$argv[1] = 'pending'; } else { @@ -91,7 +91,6 @@ class Connections extends \Zotlabs\Web\Controller { \App::$argc = 1; unset(\App::$argv[1]); } - nav_set_selected('intros'); break; // case 'unconnected': // $search_flags = " and abook_unconnected = 1 "; |