mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
support tabs in code selections (Bug #25445). Still does not solve the strange "4 spaces prefixed on every line" problem in firefox. :/
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8893 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
e12fce5f3d
commit
20b08e2961
5 changed files with 8 additions and 8 deletions
|
@ -119,6 +119,7 @@
|
||||||
<li>[Fix] Fix native full text search on postgresql while using excluding keyword matches. (Bug #19195)</li>
|
<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] Pass S_SEARCH_ACTION through append_sid() in search.php. (Bug #21585)</li>
|
||||||
<li>[Fix] Correctly delete message attachments. (Bug #23755)</li>
|
<li>[Fix] Correctly delete message attachments. (Bug #23755)</li>
|
||||||
|
<li>[Fix] Support (and retain) tabs in code blocks. (Bug #25445)</li>
|
||||||
|
|
||||||
<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
|
<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
|
||||||
<li>[Change] Display warning in ACP if config.php file is left writable.</li>
|
<li>[Change] Display warning in ACP if config.php file is left writable.</li>
|
||||||
|
|
|
@ -581,10 +581,10 @@ class bbcode
|
||||||
// no break;
|
// no break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
$code = str_replace("\t", ' ', $code);
|
/* $code = str_replace("\t", ' ', $code);
|
||||||
$code = str_replace(' ', ' ', $code);
|
$code = str_replace(' ', ' ', $code);
|
||||||
$code = str_replace(' ', ' ', $code);
|
$code = str_replace(' ', ' ', $code);
|
||||||
|
*/
|
||||||
// remove newline at the beginning
|
// remove newline at the beginning
|
||||||
if (!empty($code) && $code[0] == "\n")
|
if (!empty($code) && $code[0] == "\n")
|
||||||
{
|
{
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
<!-- BEGIN quote_open --><blockquote class="uncited"><div><!-- END quote_open -->
|
<!-- BEGIN quote_open --><blockquote class="uncited"><div><!-- END quote_open -->
|
||||||
<!-- BEGIN quote_close --></div></blockquote><!-- END quote_close -->
|
<!-- 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><code><!-- END code_open -->
|
<!-- 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></dd></dl><!-- END code_close -->
|
<!-- BEGIN code_close --></code></pre></dd></dl><!-- END code_close -->
|
||||||
|
|
||||||
<!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open -->
|
<!-- BEGIN inline_attachment_open --><div class="inline-attachment"><!-- END inline_attachment_open -->
|
||||||
<!-- BEGIN inline_attachment_close --></div><!-- END inline_attachment_close -->
|
<!-- BEGIN inline_attachment_close --></div><!-- END inline_attachment_close -->
|
||||||
|
|
|
@ -467,12 +467,11 @@ blockquote dl.codebox {
|
||||||
}
|
}
|
||||||
|
|
||||||
dl.codebox code {
|
dl.codebox code {
|
||||||
/* Also see tweaks.css */
|
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
display: block;
|
display: block;
|
||||||
height: auto;
|
height: auto;
|
||||||
max-height: 200px;
|
max-height: 200px;
|
||||||
white-space: normal;
|
/* white-space: normal; */
|
||||||
padding-top: 5px;
|
padding-top: 5px;
|
||||||
font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono;
|
font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono;
|
||||||
line-height: 1.3em;
|
line-height: 1.3em;
|
||||||
|
|
|
@ -21,11 +21,11 @@
|
||||||
<!-- END quote_close -->
|
<!-- END quote_close -->
|
||||||
|
|
||||||
<!-- BEGIN code_open -->
|
<!-- BEGIN code_open -->
|
||||||
<div class="codetitle"><b>{L_CODE}:</b></div><div class="codecontent">
|
<div class="codetitle"><b>{L_CODE}:</b></div><div class="codecontent"><pre>
|
||||||
<!-- END code_open -->
|
<!-- END code_open -->
|
||||||
|
|
||||||
<!-- BEGIN code_close -->
|
<!-- BEGIN code_close -->
|
||||||
</div>
|
</pre></div>
|
||||||
<!-- END code_close -->
|
<!-- END code_close -->
|
||||||
|
|
||||||
<!-- BEGIN inline_attachment_open -->
|
<!-- BEGIN inline_attachment_open -->
|
||||||
|
|
Loading…
Add table
Reference in a new issue