mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 06:55:19 +00:00
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
This commit is contained in:
commit
8fd8ddcbc1
3 changed files with 3 additions and 3 deletions
|
@ -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')
|
||||
);
|
||||
|
|
|
@ -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())
|
||||
);
|
||||
|
|
|
@ -442,7 +442,7 @@ function get_features($filtered = true) {
|
|||
}
|
||||
}
|
||||
if(! $has_items) {
|
||||
$narr[$k] = '';
|
||||
unset($narr[$k]);
|
||||
}
|
||||
}
|
||||
for($x = 0; $x < count($narr); $x ++) {
|
||||
|
|
Loading…
Reference in a new issue