keith
/
friendica
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8897 from annando/block-separator 

Support newline as block contact separator
This commit is contained in:
Hypolite Petovan 2020-07-19 08:43:13 -04:00 committed by GitHub
parent 11c96d380c d6a35c6995
commit 0bdd635b50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/conversation.php
View File

@ -316,7 +316,7 @@ function conv_get_blocklist()
return []; return [];
} }
$str_blocked = DI::pConfig()->get(local_user(), 'system', 'blocked'); $str_blocked = str_replace(["\n", "\r"], ",", DI::pConfig()->get(local_user(), 'system', 'blocked'));
if (empty($str_blocked)) { if (empty($str_blocked)) {
return []; return [];
} }