diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2009-04-07 12:50:31 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2009-04-07 12:50:31 +0000 |
| commit | 1e908f078e17c8ae7bf5358da6d76aae4f51712a (patch) | |
| tree | 17a94b0d886909f1a5789cb07840f22026d18d46 | |
| parent | e2f445ae14471027ecd6045288b7ce81d571c16d (diff) | |
| download | forums-1e908f078e17c8ae7bf5358da6d76aae4f51712a.tar forums-1e908f078e17c8ae7bf5358da6d76aae4f51712a.tar.gz forums-1e908f078e17c8ae7bf5358da6d76aae4f51712a.tar.bz2 forums-1e908f078e17c8ae7bf5358da6d76aae4f51712a.tar.xz forums-1e908f078e17c8ae7bf5358da6d76aae4f51712a.zip | |
Revert r9422 while we come up with a better fix
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9425 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c0df48416c..d8a5432113 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -135,7 +135,6 @@ <li>[Fix] Sort backups by date, newest first (Bug #14818)</li> <li>[Fix] Prevent incomplete backups stored if option "store and download" is selected and admin cancel download by removing the option. (Bug #20325)</li> <li>[Fix] Enforce correct case for template variables</li> - <li>[Fix] "Select all" selects much too much in Opera (Bug #42885 - Patch by TerraFrost)</li> <li>[Change] Allow download of conflicting file for later reference in automatic updater</li> <li>[Change] Default difference view is now 'inline' instead of 'side by side'</li> <li>[Change] Added new option for merging differences to conflicting files in automatic updater</li> diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 2f72ad8fdc..ed09cfa6bd 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -453,7 +453,7 @@ class bbcode_firstpass extends bbcode break; default: - return '[code:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars(trim($code)) . '[/code:' . $this->bbcode_uid . ']'; + return '[code:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($code) . '[/code:' . $this->bbcode_uid . ']'; break; } } |