From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Mon, 27 Apr 2009 12:04:28 +0000 (+0000)
Subject: Clean up remnants from half-done solutions in r49925, per comments on code review
X-Git-Tag: 1.31.0-rc.0~41976
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=e25322e5cbd50d49c8f863a120ea780acac688be;p=lhc%2Fweb%2Fwiklou.git

Clean up remnants from half-done solutions in r49925, per comments on code review
---

diff --git a/includes/User.php b/includes/User.php
index 02111b7bbc..12577f6c67 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -282,7 +282,7 @@ class User {
 		# Try cache
 		$key = wfMemcKey( 'user', 'id', $this->mId );
 		$data = $wgMemc->get( $key );
-		if ( !is_array( $data ) || $data['mVersion'] < 'MW_USER_VERSION' ) {
+		if ( !is_array( $data ) || $data['mVersion'] < MW_USER_VERSION ) {
 			# Object is expired, load from DB
 			$data = false;
 		}
@@ -972,7 +972,7 @@ class User {
 		$this->mSkin = null;
 		$this->mRights = null;
 		$this->mEffectiveGroups = null;
-		$this->mOptions = array();
+		$this->mOptions = null;
 
 		if ( $reloadFrom ) {
 			$this->mDataLoaded = false;