Skip to content

Commit

Permalink
Merge pull request #11373 from nextcloud/gs-and-saml-stable14
Browse files Browse the repository at this point in the history
[stable14] make the server ready to use global scale with SAML as auth back-end
  • Loading branch information
blizzz authored Sep 26, 2018
2 parents 7bdf3f1 + 28d6027 commit 6c4f3ac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/private/legacy/user.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public static function loginWithApache(\OCP\Authentication\IApacheBackend $backe

$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) {
Expand Down

0 comments on commit 6c4f3ac

Please sign in to comment.