diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-20 22:19:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-20 22:19:25 +0200 |
| commit | 75b6545bc271f4e488cf8dc7708a871e4c7dc446 (patch) | |
| tree | aca90d9f76ba75db4daf1cec04e755757dae53e6 /phpBB/phpbb | |
| parent | 973dfbf868f2c75c02ae7cdff0056ecf9c665d70 (diff) | |
| parent | dec6c7ea8cd147e41a9095a77c1af41480dff654 (diff) | |
| download | forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar.gz forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar.bz2 forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar.xz forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.zip | |
Merge pull request #3040 from nickvergessen/ticket/13138-asc
[3.1] Ticket/13138 Only use cookie data when we do not force a user_id
Conflicts:
phpBB/phpbb/session.php
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 |