| Index: trunk/phase3/includes/User.php |
| — | — | @@ -3602,7 +3602,6 @@ |
| 3603 | 3603 | } |
| 3604 | 3604 | |
| 3605 | 3605 | protected function loadOptions() { |
| 3606 | | - global $wgCookiePrefix; |
| 3607 | 3606 | $this->load(); |
| 3608 | 3607 | if ( $this->mOptionsLoaded || !$this->getId() ) |
| 3609 | 3608 | return; |
| — | — | @@ -3631,11 +3630,6 @@ |
| 3632 | 3631 | $this->mOptionOverrides[$row->up_property] = $row->up_value; |
| 3633 | 3632 | $this->mOptions[$row->up_property] = $row->up_value; |
| 3634 | 3633 | } |
| 3635 | | - |
| 3636 | | - //null skin if User::mId is loaded out of session data without persistant credentials |
| 3637 | | - if ( !isset( $_SESSION['wsToken'] ) && !isset( $_COOKIE["{$wgCookiePrefix}Token"] ) ) |
| 3638 | | - $this->mOptions['skin'] = null; |
| 3639 | | - |
| 3640 | 3634 | } |
| 3641 | 3635 | |
| 3642 | 3636 | $this->mOptionsLoaded = true; |