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 02111b7..12577f6 100644 (file)
--- 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;