diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-29 13:03:12 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-05-29 13:03:12 +0200 |
| commit | 835a2ebcb874377a7c450bea85b98d4d84cd0493 (patch) | |
| tree | 67c1be522e964c5bd450195e0afca318c37343df /phpBB/phpbb | |
| parent | 0e48d250d348cf451ebebe1fa89f3e9e3a992074 (diff) | |
| parent | 3f52429e3d1548ca1faa203047d9326b0e6d4baa (diff) | |
| download | forums-835a2ebcb874377a7c450bea85b98d4d84cd0493.tar forums-835a2ebcb874377a7c450bea85b98d4d84cd0493.tar.gz forums-835a2ebcb874377a7c450bea85b98d4d84cd0493.tar.bz2 forums-835a2ebcb874377a7c450bea85b98d4d84cd0493.tar.xz forums-835a2ebcb874377a7c450bea85b98d4d84cd0493.zip | |
Merge pull request #3625 from s9e/ticket/11742
[ticket/11742] Remove tabs-to-space conversion in [code]
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/renderer.php | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/renderer.php b/phpBB/phpbb/textformatter/s9e/renderer.php index 8999f1d25f..51bc44f339 100644 --- a/phpBB/phpbb/textformatter/s9e/renderer.php +++ b/phpBB/phpbb/textformatter/s9e/renderer.php @@ -234,10 +234,6 @@ class renderer implements \phpbb\textformatter\renderer_interface } $html = $this->renderer->render($xml); - if (stripos($html, '<code') !== false) - { - $html = $this->replace_tabs_in_code($html); - } /** * Modify a rendered text @@ -254,45 +250,6 @@ class renderer implements \phpbb\textformatter\renderer_interface } /** - * Replace tabs in code elements - * - * @see bbcode::bbcode_second_pass_code() - * - * @param string $html Original HTML - * @return string Modified HTML - */ - protected function replace_tabs_in_code($html) - { - return preg_replace_callback( - '((<code[^>]*>)(.*?)(</code>))is', - function ($captures) - { - $code = $captures[2]; - - $code = str_replace("\t", ' ', $code); - $code = str_replace(' ', ' ', $code); - $code = str_replace(' ', ' ', $code); - $code = str_replace("\n ", "\n ", $code); - - // keep space at the beginning - if (!empty($code) && $code[0] == ' ') - { - $code = ' ' . substr($code, 1); - } - - // remove newline at the beginning - if (!empty($code) && $code[0] == "\n") - { - $code = substr($code, 1); - } - - return $captures[1] . $code . $captures[3]; - }, - $html - ); - } - - /** * {@inheritdoc} */ public function set_smilies_path($path) |