diff options
author | redmatrix <mike@macgirvin.com> | 2016-09-19 14:46:54 -0700 |
---|---|---|
committer | redmatrix <mike@macgirvin.com> | 2016-09-19 14:46:54 -0700 |
commit | 8fd8ddcbc1124844bb910d714c0a6d61ee1261a7 (patch) | |
tree | 962b5d154b34842ed27a61f1c9b59cd117f7fa1d /Zotlabs | |
parent | 0011b8fd4809f4e8eb3f21dc036714493e45c5b4 (diff) | |
parent | 0cba82ce9c23ea4db141d2d5db3dcfcb4a4fe7dc (diff) | |
download | volse-hubzilla-8fd8ddcbc1124844bb910d714c0a6d61ee1261a7.tar.gz volse-hubzilla-8fd8ddcbc1124844bb910d714c0a6d61ee1261a7.tar.bz2 volse-hubzilla-8fd8ddcbc1124844bb910d714c0a6d61ee1261a7.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
-rw-r--r-- | Zotlabs/Module/Acl.php | 2 | ||||
-rw-r--r-- | Zotlabs/Module/Manage.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 8c62f4de9..1acd8e320 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -66,7 +66,7 @@ class Acl extends \Zotlabs\Web\Controller { // These queries require permission checking. We'll create a simple array of xchan_hash for those with // the requisite permissions which we can check against. - $x = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = '%s' and v = 1", + $x = q("select xchan from abconfig where chan = %d and cat = 'their_perms' and k = '%s' and v = '1'", intval(local_channel()), dbesc(($type === 'm') ? 'post_mail' : 'tag_deliver') ); diff --git a/Zotlabs/Module/Manage.php b/Zotlabs/Module/Manage.php index 8f815d6d4..ec9ef4c06 100644 --- a/Zotlabs/Module/Manage.php +++ b/Zotlabs/Module/Manage.php @@ -143,7 +143,7 @@ class Manage extends \Zotlabs\Web\Controller { $create = array( 'new_channel', t('Create a new channel'), t('Create New')); $delegates = q("select * from abook left join xchan on abook_xchan = xchan_hash where - abook_channel = %d and abook_xchan in ( select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'delegate' and v = 1 )", + abook_channel = %d and abook_xchan in ( select xchan from abconfig where chan = %d and cat = 'their_perms' and k = 'delegate' and v = '1' )", intval(local_channel()), intval(local_channel()) ); |