Revert r33836 and bump cached user object version so any bad cached items get cleared.

* mEmail was already cached, don't need it twice.
* mRights isn't safe to cache -- it may change due to updates to $wgGroupRights, which won't clear the cached User entries.

diff --git a/includes/User.php b/includes/User.php
index 7ab5b07..3e01e28 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -8,7 +8,7 @@
 define( 'USER_TOKEN_LENGTH', 32 );
 
 # Serialized record version
-define( 'MW_USER_VERSION', 5 );
+define( 'MW_USER_VERSION', 6 );
 
 # Some punctuation to prevent editing from broken text-mangling proxies.
 define( 'EDIT_TOKEN_SUFFIX', '+\\' );
@@ -96,7 +96,6 @@ class User {
                'mOptions',
                'mTouched',
                'mToken',
-               'mEmail',
                'mEmailAuthenticated',
                'mEmailToken',
                'mEmailTokenExpires',
@@ -104,7 +103,6 @@ class User {
                'mEditCount',
                # user_group table
                'mGroups',
-               'mRights',
        );
 
        /**