diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-01-24 23:35:49 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-01-24 23:35:49 +0100 |
| commit | a74658091b19a8d8100b241ce6ac710e472918e8 (patch) | |
| tree | ecb7f5e9d2ef10bc2a5074cf404a67590631b0ef /phpBB/phpbb/textformatter | |
| parent | 3a8305e19066fe03083104a0825300202cbd1ada (diff) | |
| parent | 532afbf83a509b25c5042f5bb374657417ca3e5d (diff) | |
| download | forums-a74658091b19a8d8100b241ce6ac710e472918e8.tar forums-a74658091b19a8d8100b241ce6ac710e472918e8.tar.gz forums-a74658091b19a8d8100b241ce6ac710e472918e8.tar.bz2 forums-a74658091b19a8d8100b241ce6ac710e472918e8.tar.xz forums-a74658091b19a8d8100b241ce6ac710e472918e8.zip | |
Merge pull request #5102 from JoshyPHP/ticket/15527
[ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migration
Diffstat (limited to 'phpBB/phpbb/textformatter')
| -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 |