diff options
author | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
---|---|---|
committer | Andrew Manning <tamanning@zoho.com> | 2016-04-03 21:36:29 -0400 |
commit | 0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f (patch) | |
tree | a92197de4503ec52889dc05483493f4df1a305b8 /mod/viewconnections.php | |
parent | 99d9456b3addc651a68874ddd391d25684252c4d (diff) | |
parent | b4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff) | |
download | volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.gz volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.bz2 volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.zip |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
Diffstat (limited to 'mod/viewconnections.php')
-rw-r--r-- | mod/viewconnections.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mod/viewconnections.php b/mod/viewconnections.php index d9a9aecc1..6e0daab6e 100644 --- a/mod/viewconnections.php +++ b/mod/viewconnections.php @@ -18,21 +18,21 @@ function viewconnections_content(&$a) { return; } - if(((! count($a->profile)) || ($a->profile['hide_friends']))) { + if(((! count(App::$profile)) || (App::$profile['hide_friends']))) { notice( t('Permission denied.') . EOL); return; } - if(! perm_is_allowed($a->profile['uid'], get_observer_hash(),'view_contacts')) { + if(! perm_is_allowed(App::$profile['uid'], get_observer_hash(),'view_contacts')) { notice( t('Permission denied.') . EOL); return; } if(! $_REQUEST['aj']) - $_SESSION['return_url'] = $a->query_string; + $_SESSION['return_url'] = App::$query_string; - $is_owner = ((local_channel() && local_channel() == $a->profile['uid']) ? true : false); + $is_owner = ((local_channel() && local_channel() == App::$profile['uid']) ? true : false); $abook_flags = " and abook_pending = 0 and abook_self = 0 "; $sql_extra = ''; @@ -43,16 +43,16 @@ function viewconnections_content(&$a) { } $r = q("SELECT count(*) as total FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $abook_flags and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra ", - intval($a->profile['uid']) + intval(App::$profile['uid']) ); if($r) { - $a->set_pager_total($r[0]['total']); + App::set_pager_total($r[0]['total']); } $r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d $abook_flags and xchan_orphan = 0 and xchan_deleted = 0 $sql_extra order by xchan_name LIMIT %d OFFSET %d ", - intval($a->profile['uid']), - intval($a->pager['itemspage']), - intval($a->pager['start']) + intval(App::$profile['uid']), + intval(App::$pager['itemspage']), + intval(App::$pager['start']) ); if((! $r) && (! $_REQUEST['aj'])) { |