Make @mention work at the end of a line in multi-line mode.

This commit is contained in:
Daniel Winzen
2016-09-20 18:48:54 +02:00
parent b2de7a0dc9
commit 18d5954138

View File

@ -2896,6 +2896,7 @@ function apply_filter(){
$U['displaysend']=style_this(htmlspecialchars($U['nickname']), $U['style']); $U['displaysend']=style_this(htmlspecialchars($U['nickname']), $U['style']);
$U['message']=preg_replace("~^/me~i", '', $U['message']); $U['message']=preg_replace("~^/me~i", '', $U['message']);
} }
$U['message']=str_replace('<br>', "\n", $U['message']);
$U['message']=preg_replace_callback('/\@([^\s]+)/i', function ($matched){ $U['message']=preg_replace_callback('/\@([^\s]+)/i', function ($matched){
global $db; global $db;
$nick=$matched[1]; $nick=$matched[1];
@ -2933,7 +2934,6 @@ function apply_filter(){
} }
return "$matched[0]"; return "$matched[0]";
}, $U['message']); }, $U['message']);
$U['message']=str_replace('<br>', "\n", $U['message']);
$filters=get_filters(); $filters=get_filters();
foreach($filters as $filter){ foreach($filters as $filter){
if($U['poststatus']!==9 || !$filter['allowinpm']){ if($U['poststatus']!==9 || !$filter['allowinpm']){