From cb7647fce8daf2b8ee88cb3d27a87605a1c082bd Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Mon, 13 Oct 2008 15:02:02 +0000
Subject: [PATCH] Comment out accidentally committed code from r42020; didn't
 mean to commit just yet

---
 includes/User.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/includes/User.php b/includes/User.php
index e14e503b48..51959c5882 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -814,6 +814,7 @@ class User {
 			$this->loadDefaults();
 			return false;
 		}
+		/*
 		if ( isset( $_SESSION['wsUserName'] ) && isset( $_COOKIE["{$wgCookiePrefix}UserName"] ) ) {
 			// Cookie and session username should match
 			if( $_SESSION['wsUserName'] == $_COOKIE["{$wgCookiePrefix}UserName"] ) {
@@ -822,6 +823,10 @@ class User {
 				$this->loadDefaults();
 				return false;
 			}
+		} 
+		*/
+		if ( isset( $_SESSION['wsUserName'] ) ) {
+			$sName = $_SESSION['wsUserName'];
 		} else if ( isset( $_COOKIE["{$wgCookiePrefix}UserName"] ) ) {
 			$sName = $_COOKIE["{$wgCookiePrefix}UserName"];
 			$_SESSION['wsUserName'] = $sName;
-- 
2.20.1