diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-18 11:05:18 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-01-18 11:05:18 +0100 |
| commit | 8b997791819ba419e7e2ceb7861bb0e3e37d87dd (patch) | |
| tree | 78b75c13632e9fcaa32f281fb23dcfcd841cf0e1 /include/html2bbcode.php | |
| parent | b5c9f80919bd8678521c31913eeb08ccc56914dd (diff) | |
| parent | 028460a5c1de4833bb1dcfaa945c1292952bf923 (diff) | |
| download | volse-hubzilla-8b997791819ba419e7e2ceb7861bb0e3e37d87dd.tar.gz volse-hubzilla-8b997791819ba419e7e2ceb7861bb0e3e37d87dd.tar.bz2 volse-hubzilla-8b997791819ba419e7e2ceb7861bb0e3e37d87dd.zip | |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'include/html2bbcode.php')
| -rw-r--r-- | include/html2bbcode.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 688c01452..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', @@ -33,6 +36,9 @@ function html2bbcode($s) { $bbtags = array( '', + '[code]$1[/code]', + '', + "\n", '[b]$1[/b]', '[i]$1[/i]', '[u]$1[/u]', |