Merge "content: Recognise .json as JsonContent in User and MediaWiki namespace"

[lhc/web/wiklou.git] / includes / User.php

diff --git a/includes/User.php b/includes/User.php
index 828c9b1..bf0326a 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -2303,8 +2303,8 @@ class User implements IDBAccessObject {
        public function clearSharedCache() {
                $id = $this->getId();
                if ( $id ) {
-                       $cache = ObjectCache::getMainWANInstance();
-                       $cache->delete( wfMemcKey( 'user', 'id', $id ) );
+                       $key = wfMemcKey( 'user', 'id', $id );
+                       ObjectCache::getMainWANInstance()->delete( $key );
                }
        }
 
@@ -2331,14 +2331,11 @@ class User implements IDBAccessObject {
         * @since 1.25
         */
        public function touch() {
-               $this->load();
-
-               if ( $this->mId ) {
-                       $this->mQuickTouched = $this->newTouchedTimestamp();
-
-                       $cache = ObjectCache::getMainWANInstance();
-                       $key = wfMemcKey( 'user-quicktouched', 'id', $this->mId );
-                       $cache->touchCheckKey( $key );
+               $id = $this->getId();
+               if ( $id ) {
+                       $key = wfMemcKey( 'user-quicktouched', 'id', $id );
+                       ObjectCache::getMainWANInstance()->touchCheckKey( $key );
+                       $this->mQuickTouched = null;
                }
        }