X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fhtml2bbcode.php;h=734282d95c2f398ec0499777c12242508979b17c;hb=b43ed54967e133ca250ee7f42a90d699781d904f;hp=b993292300ad8fe0ab1f1ba9041268770811cad7;hpb=9296d178b3696a0cf408d006b7fb9832a3344dcb;p=friendica.git
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index b993292300..734282d95c 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,22 @@ function html2bbcode($s) {
'/\(.*?)\<\/div\>/is',
'/\
/is',
'/\
(.*?)\<\/strong\>/is',
- '/\(.*?)\<\/a\>/is',
+ '/\(.*?)\<\/a\>/is',
'/\(.*?)\<\/code\>/is',
'/\(.*?)\<\/span\>/is',
+ '/\(.*?)\<\/span\>/is',
'/\(.*?)\<\/blockquote\>/is',
- '/\/is',
- '/\/is',
+ '/\