diff options
| author | friendica <info@friendica.com> | 2012-07-04 17:15:43 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-07-04 17:15:43 -0700 |
| commit | 5589bca1e031517cc440c7f2896f107dbb57296e (patch) | |
| tree | 3c1b780f22fe3a745d4cab5de3386a5779686a87 /include | |
| parent | fd626022ec02ef47b9142bba08180502babbd0ca (diff) | |
| download | volse-hubzilla-5589bca1e031517cc440c7f2896f107dbb57296e.tar.gz volse-hubzilla-5589bca1e031517cc440c7f2896f107dbb57296e.tar.bz2 volse-hubzilla-5589bca1e031517cc440c7f2896f107dbb57296e.zip | |
fix !@#$ tinymce linebreaks for the thousandth time
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 2 | ||||
| -rw-r--r-- | include/text.php | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 410f88c96..cb4a0bc6f 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -204,7 +204,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // Declare the format for [code] layout - $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism",'stripcode_br_cb',$Text); +// $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/ism",'stripcode_br_cb',$Text); $CodeLayout = '<code>$1</code>'; // Check for [code] text diff --git a/include/text.php b/include/text.php index c3558c641..409d40d59 100644 --- a/include/text.php +++ b/include/text.php @@ -1537,7 +1537,6 @@ function undo_post_tagging($s) { function fix_mce_lf($s) { $s = str_replace("\r\n","\n",$s); - $s = str_replace("\n\n","\n",$s); return $s; } |