aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Acl.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-08-23 06:57:10 -0400
committerAndrew Manning <tamanning@zoho.com>2016-08-23 06:57:10 -0400
commit420aa4bc44a2fdf707b3964582258809f978ea2d (patch)
treec6def258a9311d513d6e1e89918c2ec0d17114f7 /Zotlabs/Module/Acl.php
parent305e0538d293ff4ad72f30b11998ae3b06efa4ea (diff)
parent1e6a491400eaa01aeb2991d4b38e0255499d8b67 (diff)
downloadvolse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.tar.gz
volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.tar.bz2
volse-hubzilla-420aa4bc44a2fdf707b3964582258809f978ea2d.zip
Merge remote-tracking branch 'upstream/dev' into website-export
Diffstat (limited to 'Zotlabs/Module/Acl.php')
-rw-r--r--Zotlabs/Module/Acl.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 03dc6c5d3..8c62f4de9 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -72,6 +72,7 @@ class Acl extends \Zotlabs\Web\Controller {
);
$permitted = ids_to_array($x,'xchan');
+
}
@@ -249,7 +250,7 @@ class Acl extends \Zotlabs\Web\Controller {
);
if($z) {
foreach($z as $zz) {
- if(in_array($zz['id'],$permitted)) {
+ if(in_array($zz['hash'],$permitted)) {
$r[] = $zz;
}
}