Reverted r58313, pointless, does not fix the bug.
authorTim Starling <tstarling@users.mediawiki.org>
Thu, 7 Jan 2010 23:36:08 +0000 (23:36 +0000)
committerTim Starling <tstarling@users.mediawiki.org>
Thu, 7 Jan 2010 23:36:08 +0000 (23:36 +0000)
includes/User.php

index 2769d43..688146a 100644 (file)
@@ -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;