[ticket/12662] Fix recently merged PR changes lost in rebase

PHPBB3-12662