[ticket/12598] Fix errors after rebase

PHPBB3-12598