harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes to perms

Browse Source
This commit is contained in:
redmatrix 2016-07-19 19:33:48 -07:00
parent 2c9938f0d5
commit 237cca7a0d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/AbConfig.php
View File

@ -7,7 +7,7 @@ class AbConfig {
static public function Load($chan,$xhash,$family = '') { static public function Load($chan,$xhash,$family = '') {
if($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", $r = q("select * from abconfig where chan = %d and xchan = '%s' $where",
intval($chan), intval($chan),
dbesc($xhash) dbesc($xhash)

6
include/zot.php
View File

@ -468,9 +468,9 @@ function zot_refresh($them, $channel = null, $force = false) {
} }
if(! $my_perms) { if(! $my_perms) {
$x = \Zotlabs\Access\Permissions::FilledAutoperms($channel['channel_id']); $m = \Zotlabs\Access\Permissions::FilledAutoperms($channel['channel_id']);
if($x) { if($m) {
$my_perms = $x; $my_perms = $m;
} }
} }