From: Ryan Lane <laner@users.mediawiki.org>
Date: Tue, 6 Sep 2011 18:45:36 +0000 (+0000)
Subject: Set wsDomain based on the user's session, if domain is set in the session. When users... 
X-Git-Tag: 1.31.0-rc.0~27868
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=8ad069bd5a113c42151c82ed002db10a458e4b0d;p=lhc%2Fweb%2Fwiklou.git

Set wsDomain based on the user's session, if domain is set in the session. When users use the password change function in their preferences a domain isn't passed, it's assumed to be in their session.
---

diff --git a/includes/specials/SpecialChangePassword.php b/includes/specials/SpecialChangePassword.php
index fef507cd31..6d7f55803f 100644
--- a/includes/specials/SpecialChangePassword.php
+++ b/includes/specials/SpecialChangePassword.php
@@ -65,6 +65,9 @@ class SpecialChangePassword extends SpecialPage {
 
 		if( $request->wasPosted() && $user->matchEditToken( $request->getVal( 'token' ) ) ) {
 			try {
+				if ( isset( $_SESSION['wsDomain'] ) ) {
+					$this->mDomain = $_SESSION['wsDomain'];
+				}
 				$wgAuth->setDomain( $this->mDomain );
 				if( !$wgAuth->allowPasswordChange() ) {
 					$this->error( wfMsg( 'resetpass_forbidden' ) );