[ticket/13234] Fix conditions and CS

PHPBB3-13234
[ticket/13234] Merge branch 'ticket/13234' into ticket/13234-2

* ticket/13234:
  [ticket/13234] Fix conditions and CS

Conflicts:
	phpBB/phpbb/session.php

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

Ticket/13234
Merge pull request #3091 from Nicofuma/ticket/13234-2

Ticket/13234 2
Merge branch 'develop-olympus' into prep-release-3.1.0