phpBB Master

• 

  Marc 24 Jan 2018 2053399085f9d530d9eed06f129c118b0d56f9a9

  Merge branch '3.2.x'
• 

  Marc 24 Jan 2018 a74658091b19a8d8100b241ce6ac710e472918e8 m

  Merge pull request #5102 from JoshyPHP/ticket/15527
  [ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migration
• 

  Marc 24 Jan 2018 532afbf83a509b25c5042f5bb374657417ca3e5d m

  [ticket/15527] Remove "use" and specify full class name for exception
  PHPBB3-15527

  • phpBB/phpbb/db/migration/data/v32x/merge_duplicate_bbcodes.php (version 532afbf83a509b25c5042f5bb374657417ca3e5d)
• 

  JoshyPHP <s9e.dev@gmail.com> 22 Jan 2018 5c8a667db2e47313e687fd8afe3c4fa7c73abeb9 m

  [ticket/15527] Skip malformed BBCodes during merge_duplicate_bbcodes migration
  PHPBB3-15527

  • phpBB/phpbb/db/migration/data/v32x/merge_duplicate_bbcodes.php (version 5c8a667db2e47313e687fd8afe3c4fa7c73abeb9)
  • phpBB/phpbb/textformatter/s9e/bbcode_merger.php (version 5c8a667db2e47313e687fd8afe3c4fa7c73abeb9)