Build: #109 failed Changes by Marc

Code commits

phpBB Rhea

  • Marc

    Marc 78db28286ea1f3f647e4fdefa495727792ba6f1f

    Merge branch '3.1.x' into 3.2.x

  • Marc

    Marc 577d669ba73c0ff10bfe663079bbd13416092917 m

    Merge pull request #4472 from dsinn/ticket/14804
    [ticket/14804] Add core event to MCP after merging topics

  • Daniel Sinn <daniel.p.sinn@gmail.com>

    Daniel Sinn <daniel.p.sinn@gmail.com> 59b52d6312cd10631532f6d1dcdabef141081fdc m

    [ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804
    PHPBB3-14804

  • Daniel Sinn <daniel.p.sinn@gmail.com>

    Daniel Sinn <daniel.p.sinn@gmail.com> 32d569c59464a80eb8c78a98b1953de0aa1008d8 m

    [ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1
    PHPBB3-14804

    • phpBB/includes/mcp/mcp_forum.php (version 32d569c59464a80eb8c78a98b1953de0aa1008d8)
  • Daniel Sinn <daniel.p.sinn@gmail.com>

    Daniel Sinn <daniel.p.sinn@gmail.com> c6383d3f89c79200253f7d82ebca39f1e3b0393c m

    [ticket/14804] Rename event to mcp_forum_merge_topics_after; update @since
    PHPBB3-14804

    • phpBB/includes/mcp/mcp_forum.php (version c6383d3f89c79200253f7d82ebca39f1e3b0393c)
  • Daniel Sinn <daniel.p.sinn@gmail.com>

    Daniel Sinn <daniel.p.sinn@gmail.com> 1d25c80a9c2aa654e99905c227bcbb9dede5d2f1 m

    [ticket/14804] Add core event to MCP after merging topics
    Renamed $topic_data and defined $to_topic_data in order to avoid ambiguity
    and to stop overwriting a variable.

    PHPBB3-14804

    • phpBB/includes/mcp/mcp_forum.php (version 1d25c80a9c2aa654e99905c227bcbb9dede5d2f1)