Merge "Add "mVersion" sanity check to User::loadFromCache()"

diff --git a/includes/user/User.php b/includes/user/User.php
index 85bc733..71023c0 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -502,7 +502,10 @@ class User implements IDBAccessObject {
                $data = $processCache->get( $key );
                if ( !is_array( $data ) ) {
                        $data = $cache->get( $key );
-                       if ( !is_array( $data ) || $data['mVersion'] < self::VERSION ) {
+                       if ( !is_array( $data )
+                               || !isset( $data['mVersion'] )
+                               || $data['mVersion'] < self::VERSION
+                       ) {
                                // Object is expired
                                return false;
                        }