From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 24 Jul 2014 00:19:47 +0000 (-0700)
Subject: Reject cache with future MW_USER_VERSION versions
X-Git-Tag: 1.31.0-rc.0~14781
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=9db0dde27dcb96d56a3709f9d87e3b613c10ffeb;p=lhc%2Fweb%2Fwiklou.git

Reject cache with future MW_USER_VERSION versions

* On rollback, using newer cache versions can cause issues if fields were
  modified or removed.

Change-Id: I7be290d6f776f9234c352dd3164b8e73dad4d49e
---

diff --git a/includes/User.php b/includes/User.php
index 778e713c7d..9951595460 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -369,7 +369,7 @@ class User implements IDBAccessObject {
 		// 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;
 		}