diff options
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index e2d8b7cde4..4b8ad62a51 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -156,10 +156,9 @@ class bbcode while ($row = $db->sql_fetchrow($result)) { // To circumvent replacing newlines with <br /> for the generated html, - // we just remove newlines here. We do not do this within the admin panel to - // let the admin lay out his html code nicely - $row['bbcode_tpl'] = str_replace(array("\n", "\r"), '', $row['bbcode_tpl']); - $row['second_pass_replace'] = str_replace(array("\n", "\r"), '', $row['second_pass_replace']); + // we use carriage returns here. They are later changed back to newlines + $row['bbcode_tpl'] = str_replace("\n", "\r", $row['bbcode_tpl']); + $row['second_pass_replace'] = str_replace("\n", "\r", $row['second_pass_replace']); $rowset[$row['bbcode_id']] = $row; } |