http://www.mediawiki.org/wiki/Special:Code/MediaWiki/60814
Revision: 60814
Author: tstarling
Date: 2010-01-07 23:36:08 +0000 (Thu, 07 Jan 2010)
Log Message:
-----------
Reverted r58313, pointless, does not fix the bug.
Modified Paths:
--------------
trunk/phase3/includes/User.php
Modified: trunk/phase3/includes/User.php
===================================================================
--- trunk/phase3/includes/User.php 2010-01-07 22:54:53 UTC (rev 60813)
+++ trunk/phase3/includes/User.php 2010-01-07 23:36:08 UTC (rev 60814)
@@ -3602,7 +3602,6 @@
}
protected function loadOptions() {
- global $wgCookiePrefix;
$this->load();
if ( $this->mOptionsLoaded || !$this->getId() )
return;
@@ -3631,11 +3630,6 @@
$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;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
