From 2c819c8619eec9daa1843da9d9b8bcb2a69c2384 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 12 May 2018 12:46:09 +0200 Subject: fix postgres issue if register mode is set to yes - with approval --- include/account.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/account.php b/include/account.php index 2b24364f4..51118c3c5 100644 --- a/include/account.php +++ b/include/account.php @@ -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); -} \ No newline at end of file +} -- cgit v1.2.3 From 2d1dbc8f40d0b9fa89b99861fac30d579a400e34 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 14 May 2018 09:10:36 +0200 Subject: Revert "We're no longer setting a backup ACL for private mention typos." This reverts commit 356c7003f2d18a283a819c22c255f03397e99fc9. --- include/text.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/text.php b/include/text.php index 7a6fb3d4e..681103389 100644 --- a/include/text.php +++ b/include/text.php @@ -2717,6 +2717,10 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $i } } + if(($exclusive) && (! $access_tag)) { + $access_tag .= 'cid:' . $channel['channel_hash']; + } + // if there is an url for this channel if(isset($profile)) { -- cgit v1.2.3