X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fhtml2bbcode.php;h=d4e8cce6661cf84ebba4bac9ea9c819dba62c292;hb=0283cbfcd35a29b5689ffbf16439d448de0c7254;hp=1aaaffc5575aacdb6d7a7b9763e1c60165a48146;hpb=53928bec875bd15576d3157c678bf29e215eb63b;p=friendica.git diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 1aaaffc557..d4e8cce666 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -7,10 +7,18 @@ function html2bbcode($s) { + + // only keep newlines from source that are within pre tags + + $s = stripnl_exceptinpre($s); + + // Tags to Find $htmltags = array( - '/\n/is', + '/\
(.*?)\<\/pre\>/is', + '/\/is', + '/\<\/p\>/is', '/\(.*?)\<\/b\>/is', '/\(.*?)\<\/i\>/is', '/\(.*?)\<\/u\>/is', @@ -20,19 +28,23 @@ function html2bbcode($s) { '/\
(.*?)\<\/div\>/is', '/\
/is', '/\(.*?)\<\/strong\>/is', - '/\(.*?)\<\/a\>/is', + '/\(.*?)\<\/a\>/is', '/\(.*?)\<\/code\>/is', '/\(.*?)\<\/span\>/is', + '/\(.*?)\<\/span\>/is', '/\
(.*?)\<\/blockquote\>/is', - '/\/is', - '/\/is', + '/\