[ticket/11840] Fix remaining return statements

PHPBB3-11840