From 315784444af3145e6afba210731f0104d21f9db3 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 2 Jul 2012 01:11:19 -0700
Subject: try and get unadulterated bb2md2html2bb for simple stuff, then we'll
 work up to harder stuff

---
 include/bb2diaspora.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/bb2diaspora.php')

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 77a5f5c2a..f17e7b549 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -38,8 +38,8 @@ function diaspora2bb($s) {
 	$s = Markdown($s);
 
 	$s = str_replace('&#35;','#',$s);
-
-	$s = str_replace("\n",'<br />',$s);
+// we seem to have double linebreaks
+//	$s = str_replace("\n",'<br />',$s);
 
 	$s = html2bbcode($s);
 //	$s = str_replace('&#42;','*',$s);
-- 
cgit v1.2.3