mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 04:04:12 +02:00
Code Issues Releases Wiki Activity

[ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migration

Browse Source 
PHPBB3-15527
This commit is contained in:
JoshyPHP
2018-01-22 02:37:47 +01:00
parent d0143bec88
commit 5c8a667db2
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/phpbb/textformatter/s9e/bbcode_merger.php
View File

@@ -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