diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-28 17:08:09 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-28 17:08:09 +0000 |
| commit | 0a98003d91113336cf095c634447d4c14968cebc (patch) | |
| tree | ee88ea8f44cd72bd8f0879aa63c983093b0e4de9 | |
| parent | 7de4563d05e9ad78dbe3c6369720aa8ba80be60d (diff) | |
| download | forums-0a98003d91113336cf095c634447d4c14968cebc.tar forums-0a98003d91113336cf095c634447d4c14968cebc.tar.gz forums-0a98003d91113336cf095c634447d4c14968cebc.tar.bz2 forums-0a98003d91113336cf095c634447d4c14968cebc.tar.xz forums-0a98003d91113336cf095c634447d4c14968cebc.zip | |
revert r8893 - there were massive problems with the display and select all code
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8953 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/bbcode.php | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/bbcode.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/content.css | 3 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/bbcode.html | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index eb6a958dfb..3aa8cc942f 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -119,7 +119,6 @@ <li>[Fix] Fix native full text search on postgresql while using excluding keyword matches. (Bug #19195)</li> <li>[Fix] Pass S_SEARCH_ACTION through append_sid() in search.php. (Bug #21585)</li> <li>[Fix] Correctly delete message attachments. (Bug #23755)</li> - <li>[Fix] Support (and retain) tabs in code blocks. (Bug #25445)</li> <li>[Fix] Correctly handle unread status of subforums (that are not shown on the index) of forums that are shown on the index. (Bug #14589)</li> <li>[Fix] Stop users from deleting posts after the edit time has passed or they have been locked. (Bug #19115)</li> <li>[Fix] Split posts target forum requires 'f_post' now instead of 'm_split'. (Bug #31015)</li> diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 09830ac97e..fd8fadf3a7 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -581,10 +581,10 @@ class bbcode // no break; default: -/* $code = str_replace("\t", ' ', $code); + $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 9c6a640ef4..bb90c46ced 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -12,8 +12,8 @@ <!-- BEGIN quote_open --><blockquote class="uncited"><div><!-- END quote_open --> <!-- BEGIN quote_close --></div></blockquote><!-- END quote_close --> -<!-- BEGIN code_open --><dl class="codebox"><dt>{L_CODE}: <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></dt><dd><pre><code><!-- END code_open --> -<!-- BEGIN code_close --></code></pre></dd></dl><!-- END code_close --> +<!-- BEGIN code_open --><dl class="codebox"><dt>{L_CODE}: <a href="#" onclick="selectCode(this); return false;">{L_SELECT_ALL_CODE}</a></dt><dd><code><!-- END code_open --> +<!-- BEGIN code_close --></code></dd></dl><!-- END code_close --> <!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open --> <!-- BEGIN inline_attachment_close --></div><!-- END inline_attachment_close --> diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 98c5d3fbb3..936b53f78a 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -467,11 +467,12 @@ 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 0e95fdbcf3..50162740d0 100644 --- a/phpBB/styles/subsilver2/template/bbcode.html +++ b/phpBB/styles/subsilver2/template/bbcode.html @@ -21,11 +21,11 @@ <!-- END quote_close --> <!-- BEGIN code_open --> -<div class="codetitle"><b>{L_CODE}:</b></div><div class="codecontent"><pre> +<div class="codetitle"><b>{L_CODE}:</b></div><div class="codecontent"> <!-- END code_open --> <!-- BEGIN code_close --> -</pre></div> +</div> <!-- END code_close --> <!-- BEGIN inline_attachment_open --> |