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
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
[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.