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

3 files changed, 3 insertions, 3 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())
 		);
diff --git a/include/features.php b/include/features.php
index 1968a1f47..d1b38b48e 100644
--- a/include/features.php
+++ b/include/features.php
@@ -442,7 +442,7 @@ function get_features($filtered = true) {
 				}
 			}
 			if(! $has_items) {
-				$narr[$k] = '';
+				unset($narr[$k]);
 			}
 		}
 		for($x = 0; $x < count($narr); $x ++) {