Build #105

Plan branch:

Build: #105 failed Changes by nicofuma

Code commits

phpBB Rhea

  • nicofuma

    nicofuma cd348b200a6d3711eee6b8f028d9c7caef268e5f

    Merge branch '3.1.x' into 3.2.x
    * 3.1.x:
      [ticket/11483] Add tests for generating user act key on force reactivate
      [ticket/11483] Generate user act key if database entry is empty

  • nicofuma

    nicofuma dc32b900c58943df25ae5085c96ad47fc6e67c61 m

    Merge pull request #4486 from marc1706/ticket/11483
    [ticket/11483] Generate user act key if database entry is empty

    * github.com:phpbb/phpbb:
      [ticket/11483] Add tests for generating user act key on force reactivate
      [ticket/11483] Generate user act key if database entry is empty

  • Marc

    Marc ac36cc25ebb4b7ee26228607dd3e171641dea8bd m

    [ticket/11483] Add tests for generating user act key on force reactivate
    PHPBB3-11483

    • tests/functional/user_password_reset_test.php (version ac36cc25ebb4b7ee26228607dd3e171641dea8bd)
  • Marc

    Marc 20148e4d062019f9a1024f9afae905a4851d9aff m

    [ticket/11483] Generate user act key if database entry is empty
    The force reactivation action in the ACP will no longer overwrite the
    generated activation key in case the key stored in the database is empty.
    It will also save the generated key back to the database to actually allow
    the activation by the user.

    PHPBB3-11483

    • phpBB/includes/acp/acp_users.php (version 20148e4d062019f9a1024f9afae905a4851d9aff)