diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index d688f660f2..726e53fd82 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -570,10 +570,6 @@ class bbcode
// no break;
default:
- $code = str_replace("\t", ' ', $code);
- $code = str_replace(' ', ' ', $code);
- $code = str_replace(' ', ' ', $code);
-
// remove newline at the beginning
if (!empty($code) && $code[0] == "\n")
{
diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html
index bb90c46ced..9c6a640ef4 100644
--- a/phpBB/styles/prosilver/template/bbcode.html
+++ b/phpBB/styles/prosilver/template/bbcode.html
@@ -12,8 +12,8 @@
-- {L_CODE}: {L_SELECT_ALL_CODE}
-
+- {L_CODE}: {L_SELECT_ALL_CODE}
+
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 936b53f78a..98c5d3fbb3 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -467,12 +467,11 @@ blockquote dl.codebox {
}
dl.codebox code {
- /* Also see tweaks.css */
overflow: auto;
display: block;
height: auto;
max-height: 200px;
- white-space: normal;
+ /* white-space: normal; */
padding-top: 5px;
font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono;
line-height: 1.3em;
diff --git a/phpBB/styles/subsilver2/template/bbcode.html b/phpBB/styles/subsilver2/template/bbcode.html
index 50162740d0..0e95fdbcf3 100644
--- a/phpBB/styles/subsilver2/template/bbcode.html
+++ b/phpBB/styles/subsilver2/template/bbcode.html
@@ -21,11 +21,11 @@
-{L_CODE}: