diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-15 10:18:38 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-15 10:18:38 -0600 |
| commit | 7cf673f0dbdc689eedf0c515f08c6739bc463866 (patch) | |
| tree | 4075fc193299f05a2032b326a1e47adfed31fd3e /phpBB/includes/message_parser.php | |
| parent | bec05a11f38cd57d7e7a6c7f64ecdb7351e24fc0 (diff) | |
| parent | 762cb074c330480340a6c14abb37e82a1ff8b09d (diff) | |
| download | forums-7cf673f0dbdc689eedf0c515f08c6739bc463866.tar forums-7cf673f0dbdc689eedf0c515f08c6739bc463866.tar.gz forums-7cf673f0dbdc689eedf0c515f08c6739bc463866.tar.bz2 forums-7cf673f0dbdc689eedf0c515f08c6739bc463866.tar.xz forums-7cf673f0dbdc689eedf0c515f08c6739bc463866.zip | |
Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103
# By Oleg Pudeyev (20) and others
# Via Andreas Fischer (3) and Oleg Pudeyev (2)
* 'develop' of github.com:phpbb/phpbb3: (33 commits)
[ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing.
[ticket/11250] Use user defined message as incomplete message
[ticket/11250] Add tests for simple nesting and code
[ticket/11250] Run tests by default and add an option for incomplete ones
[ticket/11250] Fix parsing result with special chars
[ticket/11250] Add tests for size and attachment
[ticket/11250] Fix method names
[ticket/11250] Add some comments and fix a description
[ticket/11250] Add some more tests for quotes
[ticket/11250] Move quote special cases from class to unit tests
[ticket/11250] Add parsing tests for our basic bbcodes in simple cases
[ticket/11162] Reformat.
[ticket/11162] Rename tricky updates to database helper.
[ticket/11162] Use empty($queries).
[ticket/11162] Review comments fixed.
[ticket/11162] Reformat.
[ticket/11162] Newlines to LF.
[ticket/11162] Use correct functions.
[ticket/11162] Account for notify_status.
[ticket/11162] This test really only works for bookmarks.
...
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 1cd2a46fa1..44960dd78d 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -702,17 +702,6 @@ class bbcode_firstpass extends bbcode { global $config, $user; - /** - * If you change this code, make sure the cases described within the following reports are still working: - * #3572 - [quote="[test]test"]test [ test[/quote] - (correct: parsed) - * #14667 - [quote]test[/quote] test ] and [ test [quote]test[/quote] (correct: parsed) - * #14770 - [quote="["]test[/quote] (correct: parsed) - * [quote="[i]test[/i]"]test[/quote] (correct: parsed) - * [quote="[quote]test[/quote]"]test[/quote] (correct: parsed - Username displayed as [quote]test[/quote]) - * #20735 - [quote]test[/[/b]quote] test [/quote][/quote] test - (correct: quoted: "test[/[/b]quote] test" / non-quoted: "[/quote] test" - also failed if layout distorted) - * #40565 - [quote="a"]a[/quote][quote="a]a[/quote] (correct: first quote tag parsed, second quote tag unparsed) - */ - $in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in))); if (!$in) |