X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fhtml2bbcode.php;h=8025c336bc9ca5b3aa7cf7ce6044af7bd90108e7;hb=0f4a42f550b5bc863cec7c7a3fca26a028599dcc;hp=6af8df824e76bbf35552e881b81aaa2c783364c5;hpb=97bb80c00f4106d63d730f6bcaebf9e4aa247c01;p=friendica.git diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 6af8df824e..8025c336bc 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -7,10 +7,15 @@ 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', @@ -19,6 +24,10 @@ function html2bbcode($s) { '/\(.*?)\<\/u\>/is', '/\
(.*?)\<\/ul\>/is', '/\
- (.*?)\<\/li\>/is', + '/\
/is', + '/\
/is', + '/\
/is', + '/\
/is', '/\
/is', '/\
(.*?)\<\/div\>/is', '/\
/is', @@ -26,16 +35,17 @@ function html2bbcode($s) { '/\(.*?)\<\/a\>/is', '/\(.*?)\<\/code\>/is', '/\(.*?)\<\/span\>/is', + '/\(.*?)\<\/span\>/is', '/\
(.*?)\<\/blockquote\>/is', '/\