[ticket/13234] Fix conditions and CS

PHPBB3-13234
Merge pull request #3090 from Nicofuma/ticket/13234

Ticket/13234