From fa1f2ce8f38962b97c4a6a327c5f50e238eabb9b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 17 Jan 2011 19:50:18 -0800
Subject: fix some linebreak issues

---
 include/html2bbcode.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'include/html2bbcode.php')

diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 7cacadd65..65cbcec41 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -11,6 +11,9 @@ function html2bbcode($s) {
 
 	$htmltags = array(
 		'/\n/is',
+		'/\<pre\>(.*?)\<\/pre\>/is',
+		'/\<p(.*?)\>/is',
+		'/\<\/p\>/is',
 		'/\<b\>(.*?)\<\/b\>/is',
 		'/\<i\>(.*?)\<\/i\>/is',
 		'/\<u\>(.*?)\<\/u\>/is',
@@ -32,6 +35,9 @@ function html2bbcode($s) {
 	// Replace with
 
 	$bbtags = array(
+		'',
+		'[code]$1[/code]',
+		'',
 		"\n",
 		'[b]$1[/b]',
 		'[i]$1[/i]',
-- 
cgit v1.2.3