From 03d3a3f4ea02673c120ef2622062450def7fa1d9 Mon Sep 17 00:00:00 2001 From: Jure Kajzer Date: Thu, 29 Oct 2009 14:19:05 +0000 Subject: [PATCH] Switch to default skin if user session found without persistent creds. Bug 19048 --- includes/User.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/includes/User.php b/includes/User.php index 84354142e9..e577dde4b4 100644 --- a/includes/User.php +++ b/includes/User.php @@ -3575,6 +3575,7 @@ class User { } protected function loadOptions() { + global $wgCookiePrefix; $this->load(); if ( $this->mOptionsLoaded || !$this->getId() ) return; @@ -3603,6 +3604,11 @@ 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; -- 2.20.1