aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-07-02 16:34:01 -0700
committerfriendica <info@friendica.com>2012-07-02 16:34:01 -0700
commitced0a208d8fecedcf2051be1cd16717a698d881a (patch)
treee352901b1e051bb1a225bc6f7f136ae76bd0a97f /include
parent64fc1318c68e55f3ba3cf393c32d6d8d12cd51d5 (diff)
downloadvolse-hubzilla-ced0a208d8fecedcf2051be1cd16717a698d881a.tar.gz
volse-hubzilla-ced0a208d8fecedcf2051be1cd16717a698d881a.tar.bz2
volse-hubzilla-ced0a208d8fecedcf2051be1cd16717a698d881a.zip
fix double lines
Diffstat (limited to 'include')
-rw-r--r--include/bbcode.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 1c6ce1d45..410f88c96 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -93,8 +93,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// Convert new line chars to html <br /> tags
+ // nlbr seems to be hopelessly messed up
+ // $Text = nl2br($Text);
-// $Text = nl2br($Text);
+ // We'll emulate it.
+
+ $Text = str_replace("\r\n","\n", $Text);
$Text = str_replace(array("\r","\n"), array('<br />','<br />'), $Text);
if($preserve_nl)