diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-19 19:33:48 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-19 19:33:48 -0700 |
| commit | 237cca7a0d0a025bdbccef19b8e25a687ec7cfa3 (patch) | |
| tree | a664e51cb15414454b8d94140bbe65cfd963abf5 | |
| parent | 2c9938f0d555145d4cae53cfc0a66443efd7db29 (diff) | |
| download | volse-hubzilla-237cca7a0d0a025bdbccef19b8e25a687ec7cfa3.tar.gz volse-hubzilla-237cca7a0d0a025bdbccef19b8e25a687ec7cfa3.tar.bz2 volse-hubzilla-237cca7a0d0a025bdbccef19b8e25a687ec7cfa3.zip | |
fixes to perms
| -rw-r--r-- | Zotlabs/Lib/AbConfig.php | 2 | ||||
| -rw-r--r-- | include/zot.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Lib/AbConfig.php b/Zotlabs/Lib/AbConfig.php index cab59abbd..cb5d96951 100644 --- a/Zotlabs/Lib/AbConfig.php +++ b/Zotlabs/Lib/AbConfig.php @@ -7,7 +7,7 @@ class AbConfig { static public function Load($chan,$xhash,$family = '') { if($family) - $where = sprintf(" and family = '%s' ",dbesc($family)); + $where = sprintf(" and cat = '%s' ",dbesc($family)); $r = q("select * from abconfig where chan = %d and xchan = '%s' $where", intval($chan), dbesc($xhash) diff --git a/include/zot.php b/include/zot.php index cc892e13b..dec3dc2bc 100644 --- a/include/zot.php +++ b/include/zot.php @@ -468,9 +468,9 @@ function zot_refresh($them, $channel = null, $force = false) { } if(! $my_perms) { - $x = \Zotlabs\Access\Permissions::FilledAutoperms($channel['channel_id']); - if($x) { - $my_perms = $x; + $m = \Zotlabs\Access\Permissions::FilledAutoperms($channel['channel_id']); + if($m) { + $my_perms = $m; } } |