aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/bbcode.php
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-08-07 16:23:26 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2011-08-07 16:23:26 -0400
commiteb4660f4ef455d3ce6b5a24db2dae52ddc095133 (patch)
tree1119110bde6cdd455c5f7d81d02ac078a144ac2d /phpBB/includes/bbcode.php
parentec3f4db4254783a8542da5ed479949cee7a98454 (diff)
parent627e2644a2aee478303e63577213329225a39173 (diff)
downloadforums-eb4660f4ef455d3ce6b5a24db2dae52ddc095133.tar
forums-eb4660f4ef455d3ce6b5a24db2dae52ddc095133.tar.gz
forums-eb4660f4ef455d3ce6b5a24db2dae52ddc095133.tar.bz2
forums-eb4660f4ef455d3ce6b5a24db2dae52ddc095133.tar.xz
forums-eb4660f4ef455d3ce6b5a24db2dae52ddc095133.zip
Merge remote-tracking branch 'naderman/ticket/8937' into develop-olympus
* naderman/ticket/8937: [ticket/8937] Keep space characters in front of [code] bbcode content
Diffstat (limited to 'phpBB/includes/bbcode.php')
-rw-r--r--phpBB/includes/bbcode.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index d77bb3c4a7..9356e3e9b4 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -584,6 +584,13 @@ class bbcode
$code = str_replace("\t", '&nbsp; &nbsp;', $code);
$code = str_replace(' ', '&nbsp; ', $code);
$code = str_replace(' ', ' &nbsp;', $code);
+ $code = str_replace("\n ", "\n&nbsp;", $code);
+
+ // keep space at the beginning
+ if (!empty($code) && $code[0] == ' ')
+ {
+ $code = '&nbsp;' . substr($code, 1);
+ }
// remove newline at the beginning
if (!empty($code) && $code[0] == "\n")