From: Ryan Lane <laner@users.mediawiki.org>
Date: Fri, 23 Dec 2011 01:26:52 +0000 (+0000)
Subject: Fix a session invalidation error when using LdapAuthentication.
X-Git-Tag: 1.31.0-rc.0~25794
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=a07270049a2b35662283795ff884cf97ebac673e;p=lhc%2Fweb%2Fwiklou.git

Fix a session invalidation error when using LdapAuthentication.
---

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 8ca309586f..83ab23469e 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -127,7 +127,11 @@ class LoginForm extends SpecialPage {
 		}
 
 		if( !$wgAuth->validDomain( $this->mDomain ) ) {
-			$this->mDomain = 'invaliddomain';
+			if ( isset( $_SESSION['wsDomain'] ) ) {
+				$this->mDomain = $_SESSION['wsDomain'];
+			} else {
+				$this->mDomain = 'invaliddomain';
+			}
 		}
 		$wgAuth->setDomain( $this->mDomain );