fix some linebreak issues

2011-01-17 19:50:18 -08:00
parent 050618a2b6
commit fa1f2ce8f3
2 changed files with 20 additions and 9 deletions
--- 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]',