[ticket/12598] Fix sloppy merge

PHPBB3-12598