diff options
| author | JoshyPHP <s9e.dev@gmail.com> | 2018-01-22 02:37:47 +0100 |
|---|---|---|
| committer | JoshyPHP <s9e.dev@gmail.com> | 2018-01-22 02:37:47 +0100 |
| commit | 5c8a667db2e47313e687fd8afe3c4fa7c73abeb9 (patch) | |
| tree | 6b9b3e14aa5b211ebcbe3a5d275de99df2aeb203 /phpBB/phpbb/textformatter/s9e/bbcode_merger.php | |
| parent | d0143bec8830e709047443f73f79c0dce438e3fc (diff) | |
| download | forums-5c8a667db2e47313e687fd8afe3c4fa7c73abeb9.tar forums-5c8a667db2e47313e687fd8afe3c4fa7c73abeb9.tar.gz forums-5c8a667db2e47313e687fd8afe3c4fa7c73abeb9.tar.bz2 forums-5c8a667db2e47313e687fd8afe3c4fa7c73abeb9.tar.xz forums-5c8a667db2e47313e687fd8afe3c4fa7c73abeb9.zip | |
[ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migration
PHPBB3-15527
Diffstat (limited to 'phpBB/phpbb/textformatter/s9e/bbcode_merger.php')
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/bbcode_merger.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/bbcode_merger.php b/phpBB/phpbb/textformatter/s9e/bbcode_merger.php index 72b1473751..a05ca3c2b8 100644 --- a/phpBB/phpbb/textformatter/s9e/bbcode_merger.php +++ b/phpBB/phpbb/textformatter/s9e/bbcode_merger.php @@ -37,6 +37,9 @@ class bbcode_merger * * All of the arrays contain a "usage" element and a "template" element * + * @throws InvalidArgumentException if a definition cannot be interpreted + * @throws RuntimeException if something unexpected occurs + * * @param array $without BBCode definition without an attribute * @param array $with BBCode definition with an attribute * @return array Merged definition |