Merge "Prevent duplicate memcached lookups for user record"

diff --combined includes/user/User.php
index 7485591,90c05d8..c92c06b
--- 1/includes/user/User.php
--- 2/includes/user/User.php
+++ b/includes/user/User.php
@@@ -315,12 -315,9 +315,12 @@@ class User implements IDBAccessObject 
        }
  
        /**
 -       * Test if it's safe to load this User object. You should typically check this before using
 -       * $wgUser or RequestContext::getUser in a method that might be called before the system has
 -       * been fully initialized. If the object is unsafe, you should use an anonymous user:
 +       * Test if it's safe to load this User object.
 +       *
 +       * You should typically check this before using $wgUser or
 +       * RequestContext::getUser in a method that might be called before the
 +       * system has been fully initialized. If the object is unsafe, you should
 +       * use an anonymous user:
         * \code
         * $user = $wgUser->isSafeToLoad() ? $wgUser : new User;
         * \endcode
@@@ -330,14 -327,7 +330,14 @@@
         */
        public function isSafeToLoad() {
                global $wgFullyInitialised;
 -              return $wgFullyInitialised || $this->mLoadedItems === true || $this->mFrom !== 'session';
 +
 +              // The user is safe to load if:
 +              // * MW_NO_SESSION is undefined AND $wgFullyInitialised is true (safe to use session data)
 +              // * mLoadedItems === true (already loaded)
 +              // * mFrom !== 'session' (sessions not involved at all)
 +
 +              return ( !defined( 'MW_NO_SESSION' ) && $wgFullyInitialised ) ||
 +                      $this->mLoadedItems === true || $this->mFrom !== 'session';
        }
  
        /**
@@@ -468,12 -458,18 +468,18 @@@
                }
  
                $cache = ObjectCache::getMainWANInstance();
-               $data = $cache->get( $this->getCacheKey( $cache ) );
-               if ( !is_array( $data ) || $data['mVersion'] < self::VERSION ) {
-                       // Object is expired
-                       return false;
+               $key = $this->getCacheKey( $cache );
+ 
+               $processCache = ObjectCache::getLocalServerInstance( 'hash' );
+               $data = $processCache->get( $key );
+               if ( !is_array( $data ) ) {
+                       $data = $cache->get( $key );
+                       if ( !is_array( $data ) || $data['mVersion'] < self::VERSION ) {
+                               // Object is expired
+                               return false;
+                       }
+                       $processCache->set( $key, $data );
                }
- 
                wfDebug( "User: got user {$this->mId} from cache\n" );
  
                // Restore from cache