[ticket/11620] Changes for code guidelines consistency

PHPBB3-11620