diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-20 22:19:43 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-20 22:19:43 +0200 |
| commit | 7c2ed57a9916337da261794a1baa044a5814b8a1 (patch) | |
| tree | 809021b8871442397d83d71366e6bf9212e89783 /phpBB/phpbb | |
| parent | 79d6f67e81f9f039eccf48bbb310e6278fdc4593 (diff) | |
| parent | 75b6545bc271f4e488cf8dc7708a871e4c7dc446 (diff) | |
| download | forums-7c2ed57a9916337da261794a1baa044a5814b8a1.tar forums-7c2ed57a9916337da261794a1baa044a5814b8a1.tar.gz forums-7c2ed57a9916337da261794a1baa044a5814b8a1.tar.bz2 forums-7c2ed57a9916337da261794a1baa044a5814b8a1.tar.xz forums-7c2ed57a9916337da261794a1baa044a5814b8a1.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/session.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 234842b550..cf8ea1877e 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -593,15 +593,15 @@ class session } else if (!$bot) { - $provider_collection = $phpbb_container->get('auth.provider_collection'); - $provider = $provider_collection->get_provider(); - $this->data = $provider->autologin(); - - if (sizeof($this->data)) - { - $this->cookie_data['k'] = ''; - $this->cookie_data['u'] = $this->data['user_id']; - } + $provider_collection = $phpbb_container->get('auth.provider_collection'); + $provider = $provider_collection->get_provider(); + $this->data = $provider->autologin(); + + if (sizeof($this->data)) + { + $this->cookie_data['k'] = ''; + $this->cookie_data['u'] = $this->data['user_id']; + } // If we're presented with an autologin key we'll join against it. // Else if we've been passed a user_id we'll grab data based on that |