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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
redmatrix 2016-09-19 14:46:54 -07:00
commit 8fd8ddcbc1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Acl.php
View File

@ -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 // 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. // 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()), intval(local_channel()),
dbesc(($type === 'm') ? 'post_mail' : 'tag_deliver') dbesc(($type === 'm') ? 'post_mail' : 'tag_deliver')
); );

2
Zotlabs/Module/Manage.php
View File

@ -143,7 +143,7 @@ class Manage extends \Zotlabs\Web\Controller {
$create = array( 'new_channel', t('Create a new channel'), t('Create New')); $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 $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()),
intval(local_channel()) intval(local_channel())
); );

2
include/features.php
View File

@ -442,7 +442,7 @@ function get_features($filtered = true) {
} }
} }
if(! $has_items) { if(! $has_items) {
$narr[$k] = ''; unset($narr[$k]);
} }
} }
for($x = 0; $x < count($narr); $x ++) { for($x = 0; $x < count($narr); $x ++) {