revert html in markdown for posts, but trim the input before processing the markdown
This commit is contained in:
parent
959c3ba89d
commit
3d80073a0e
@ -3181,7 +3181,7 @@ function tag_deliver($uid, $item_id) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if((! $mention) && (! $union)) {
|
if((! $mention) && (! $union)) {
|
||||||
logger('tag_deliver: no mention and no union.');
|
logger('tag_deliver: no mention for ' . $u[0]['channel_name'] . ' and no union.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -473,8 +473,8 @@ function item_post(&$a) {
|
|||||||
require_once('include/text.php');
|
require_once('include/text.php');
|
||||||
if($uid && $uid == $profile_uid && feature_enabled($uid,'markdown')) {
|
if($uid && $uid == $profile_uid && feature_enabled($uid,'markdown')) {
|
||||||
require_once('include/bb2diaspora.php');
|
require_once('include/bb2diaspora.php');
|
||||||
|
$body = escape_tags(trim($body));
|
||||||
$body = str_replace("\n",'<br />', $body);
|
$body = str_replace("\n",'<br />', $body);
|
||||||
$body = purify_html($body);
|
|
||||||
|
|
||||||
$body = preg_replace_callback('/\[share(.*?)\]/ism','share_shield',$body);
|
$body = preg_replace_callback('/\[share(.*?)\]/ism','share_shield',$body);
|
||||||
$body = diaspora2bb($body,true);
|
$body = diaspora2bb($body,true);
|
||||||
|
Reference in New Issue
Block a user