From a5755b59a82bd0d1400a958bbdf9fa8b000189d2 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 4 Jan 2013 15:21:05 -0800 Subject: [PATCH] preserve multiple newlines - see discussion at https://github.com/friendica/friendica/pull/570 --- include/bbcode.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 08edc19340..fc2d97c13c 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -312,6 +312,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","[share$1]$2[/share]",$Text); $Text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism","[quote$1]$2[/quote]",$Text); + $Text = preg_replace("/\n\[code\]/ism", "[code]", $Text); + $Text = preg_replace("/\[\/code\]\n/ism", "[/code]", $Text); + // when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems if (!$tryoembed) $Text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","\n[share$1$2]$3[/share]",$Text); @@ -327,12 +330,13 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = str_replace("\r\n","\n", $Text); // removing multiplicated newlines - $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]"); - $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]"); - do { - $oldtext = $Text; - $Text = str_replace($search, $replace, $Text); - } while ($oldtext != $Text); +// $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]"); +// $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]"); +// do { +// $oldtext = $Text; +// $Text = str_replace($search, $replace, $Text); +// } while ($oldtext != $Text); + $Text = str_replace(array("\r","\n"), array('
','
'), $Text);