diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-12 14:38:48 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-12 14:38:48 -0400 |
| commit | a1183bf09a93459282078038b94ef89c00297604 (patch) | |
| tree | 2e14bec170e37c6615fcd5ff2892233ddffce452 /Zotlabs/Module/Acl.php | |
| parent | 7fc2b13fe605ad461f6b6aeacd6a187c1ef794de (diff) | |
| parent | 1789c3242adcf11fe37f0ef0ec6180966853eeda (diff) | |
| download | volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.tar.gz volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.tar.bz2 volse-hubzilla-a1183bf09a93459282078038b94ef89c00297604.zip | |
Merge remote-tracking branch 'upstream/dev' into embedphotos
Diffstat (limited to 'Zotlabs/Module/Acl.php')
| -rw-r--r-- | Zotlabs/Module/Acl.php | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 7bc197a93..2bc4ba62d 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -65,18 +65,20 @@ class Acl extends \Zotlabs\Web\Controller { intval($count), intval($start) ); - - foreach($r as $g){ - // logger('acl: group: ' . $g['gname'] . ' members: ' . group_get_members_xchan($g['id'])); - $groups[] = array( - "type" => "g", - "photo" => "images/twopeople.png", - "name" => $g['gname'], - "id" => $g['id'], - "xid" => $g['hash'], - "uids" => group_get_members_xchan($g['id']), - "link" => '' - ); + + if($r) { + foreach($r as $g){ + // logger('acl: group: ' . $g['gname'] . ' members: ' . group_get_members_xchan($g['id'])); + $groups[] = array( + "type" => "g", + "photo" => "images/twopeople.png", + "name" => $g['gname'], + "id" => $g['id'], + "xid" => $g['hash'], + "uids" => group_get_members_xchan($g['id']), + "link" => '' + ); + } } } @@ -204,7 +206,7 @@ class Acl extends \Zotlabs\Web\Controller { else $r = array(); - if(count($r)) { + if($r) { foreach($r as $g){ // remove RSS feeds from ACLs - they are inaccessible |