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

2018-05-14 17:23:19 -07:00
parent d9759ba63c 2d1dbc8f40
commit 229d82c4c7
197 changed files with 7542 additions and 6128 deletions
@@ -331,7 +331,9 @@ function verify_email_address($arr) {

 function send_reg_approval_email($arr) {

-	$r = q("select * from account where account_roles & " . intval(ACCOUNT_ROLE_ADMIN));
+	$r = q("select * from account where (account_roles & %d) >= 4096",
+		 intval(ACCOUNT_ROLE_ADMIN)
+	);
 	if(! ($r && count($r)))
 		return false;

@@ -828,4 +830,4 @@ function get_account_techlevel($account_id = 0) {

 	return (($x) ? intval($x['account_level']) : 0);

-}
+}