upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 22

Merge pull request #11373 from nextcloud/gs-and-saml-stable14

Browse source 
[stable14] make the server ready to use global scale with SAML as auth back-end
This commit is contained in:
blizzz 2018-09-26 11:04:54 +02:00 committed by GitHub
commit 6c4f3ac1d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/legacy/user.php
View file

@ -166,7 +166,7 @@ class OC_User {
$uid = $backend->getCurrentUserId();
$run = true;
OC_Hook::emit("OC_User", "pre_login", array("run" => &$run, "uid" => $uid));
OC_Hook::emit("OC_User", "pre_login", array("run" => &$run, "uid" => $uid, 'backend' => $backend));
if ($uid) {
if (self::getUser() !== $uid) {