From: Tim Starling <tstarling@users.mediawiki.org>
Date: Thu, 7 Jan 2010 23:36:08 +0000 (+0000)
Subject: Reverted r58313, pointless, does not fix the bug.
X-Git-Tag: 1.31.0-rc.0~38362
X-Git-Url: http://git.cyclocoop.org/%22.%24redirect_annul.%22?a=commitdiff_plain;h=0e94ef3836f7fb0c05be90cca623a143698edee9;p=lhc%2Fweb%2Fwiklou.git

Reverted r58313, pointless, does not fix the bug.
---

diff --git a/includes/User.php b/includes/User.php
index 2769d431e6..688146a7c3 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -3602,7 +3602,6 @@ class User {
 	}
 
 	protected function loadOptions() {
-		global $wgCookiePrefix;
 		$this->load();
 		if ( $this->mOptionsLoaded || !$this->getId() )
 			return;
@@ -3631,11 +3630,6 @@ class User {
 				$this->mOptionOverrides[$row->up_property] = $row->up_value;
 				$this->mOptions[$row->up_property] = $row->up_value;
 			}
-
-			//null skin if User::mId is loaded out of session data without persistant credentials
-			if ( !isset( $_SESSION['wsToken'] ) && !isset( $_COOKIE["{$wgCookiePrefix}Token"] ) )
-				$this->mOptions['skin'] = null;
-
 		}
 
 		$this->mOptionsLoaded = true;