Build #802

Plan branch:

Build: #802 was successful Changes by Marc and Matt Friedman <maf675@gmail.com>

Stages & jobs

  1. Default Stage

Code commits

phpBB Master

  • Marc

    Marc d095a8537d815cf024160210e9e35b0a59454b10

    Merge branch '3.3.x'

  • Marc

    Marc 9de41ce44c06447f7348b1164eb8a7fdcc87ddf1 m

    Merge pull request #6038 from JoshyPHP/ticket/16580
    [ticket/16580] Update rendering tests to match actual Prosilver

  • Marc

    Marc 6e97bfa9568a5e263438f2ec15473de78f56532c

    Merge pull request #6040 from iMattPro/ticket/16237
    [ticket/16237] Fix broken vars and remove conditional overhead

  • Matt Friedman <maf675@gmail.com>

    Matt Friedman <maf675@gmail.com> 9b9ca2593477e71e9f2f55d48ebe0790d6adc1fa

    [ticket/16237] Fix broken vars and remove conditional overhead
    PHPBB3-16237

    • phpBB/includes/mcp/mcp_forum.php (version 9b9ca2593477e71e9f2f55d48ebe0790d6adc1fa)
    • phpBB/includes/ucp/ucp_main.php (version 9b9ca2593477e71e9f2f55d48ebe0790d6adc1fa)
    • phpBB/search.php (version 9b9ca2593477e71e9f2f55d48ebe0790d6adc1fa)
    • phpBB/viewforum.php (version 9b9ca2593477e71e9f2f55d48ebe0790d6adc1fa)
  • JoshyPHP <s9e.dev@gmail.com>

    JoshyPHP <s9e.dev@gmail.com> 9efa7c1a8ca5ddf1a22bfca0cabe3fc7162aa4c6 m

    [ticket/16580] Fixed email template in bbcode.html
    Relates to #4976

    PHPBB3-16580

    • phpBB/styles/prosilver/template/bbcode.html (version 9efa7c1a8ca5ddf1a22bfca0cabe3fc7162aa4c6)
  • JoshyPHP <s9e.dev@gmail.com>

    JoshyPHP <s9e.dev@gmail.com> 1ac142347ef7e0d74faa148f03fc991fb0cec526 m

    [ticket/16580] Update rendering tests to match actual Prosilver
    PHPBB3-16580

    • tests/test_framework/phpbb_test_case_helpers.php (version 1ac142347ef7e0d74faa148f03fc991fb0cec526)
    • tests/text_formatter/s9e/default_formatting_test.php (version 1ac142347ef7e0d74faa148f03fc991fb0cec526)
    • tests/text_formatter/s9e/fixtures/default_formatting.xml (version 1ac142347ef7e0d74faa148f03fc991fb0cec526)
    • tests/text_formatter/s9e/fixtures/factory.xml (version 1ac142347ef7e0d74faa148f03fc991fb0cec526)
  • JoshyPHP <s9e.dev@gmail.com>

    JoshyPHP <s9e.dev@gmail.com> 762d9fcf7b4499da87fd913cc629a999d782d239 m

    [ticket/16580] Updated email-related test
    This ensures that re-activating email fields does not introduce any exploit

    PHPBB3-16580

    • tests/text_processing/tickets_data/PHPBB3-10922.html (version 762d9fcf7b4499da87fd913cc629a999d782d239)
    • tests/text_processing/tickets_data/PHPBB3-10922.txt (version 762d9fcf7b4499da87fd913cc629a999d782d239)
  • JoshyPHP <s9e.dev@gmail.com>

    JoshyPHP <s9e.dev@gmail.com> 62333f0ca2f50641790c823f8910bc614ef42bd9 m

    [ticket/16580] Updated regression tests
    PHPBB3-16580

    • tests/text_processing/tickets_data/PHPBB3-10268.html (version 62333f0ca2f50641790c823f8910bc614ef42bd9)
    • tests/text_processing/tickets_data/PHPBB3-13921.html (version 62333f0ca2f50641790c823f8910bc614ef42bd9)