Merge "Follow-up 9c9cfa2ec3d7: fix non-session entry point error"

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

diff --git a/includes/user/User.php b/includes/user/User.php
index f7dcb93..84298e2 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -419,12 +419,12 @@ class User implements IDBAccessObject, UserIdentity {
 
        /**
         * @since 1.27
-        * @param string $wikiId
+        * @param string $dbDomain
         * @param int $userId
         */
-       public static function purge( $wikiId, $userId ) {
+       public static function purge( $dbDomain, $userId ) {
                $cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
-               $key = $cache->makeGlobalKey( 'user', 'id', $wikiId, $userId );
+               $key = $cache->makeGlobalKey( 'user', 'id', $dbDomain, $userId );
                $cache->delete( $key );
        }
 
@@ -608,16 +608,16 @@ class User implements IDBAccessObject, UserIdentity {
         * @param int|null $userId User ID, if known
         * @param string|null $userName User name, if known
         * @param int|null $actorId Actor ID, if known
-        * @param bool|string $wikiId remote wiki to which the User/Actor ID applies, or false if none
+        * @param bool|string $dbDomain remote wiki to which the User/Actor ID applies, or false if none
         * @return User
         */
-       public static function newFromAnyId( $userId, $userName, $actorId, $wikiId = false ) {
+       public static function newFromAnyId( $userId, $userName, $actorId, $dbDomain = false ) {
                global $wgActorTableSchemaMigrationStage;
 
                // Stop-gap solution for the problem described in T222212.
                // Force the User ID and Actor ID to zero for users loaded from the database
                // of another wiki, to prevent subtle data corruption and confusing failure modes.
-               if ( $wikiId !== false ) {
+               if ( $dbDomain !== false ) {
                        $userId = 0;
                        $actorId = 0;
                }
@@ -3463,7 +3463,7 @@ class User implements IDBAccessObject, UserIdentity {
 
                        if ( $count === null ) {
                                // it has not been initialized. do so.
-                               $count = $this->initEditCountInternal();
+                               $count = $this->initEditCountInternal( $dbr );
                        }
                        $this->mEditCount = $count;
                }
@@ -5023,14 +5023,13 @@ class User implements IDBAccessObject, UserIdentity {
        /**
         * Initialize user_editcount from data out of the revision table
         *
-        * This method should not be called outside User/UserEditCountUpdate
-        *
+        * @internal This method should not be called outside User/UserEditCountUpdate
+        * @param IDatabase $dbr Replica database
         * @return int Number of edits
         */
-       public function initEditCountInternal() {
+       public function initEditCountInternal( IDatabase $dbr ) {
                // Pull from a replica DB to be less cruel to servers
                // Accuracy isn't the point anyway here
-               $dbr = wfGetDB( DB_REPLICA );
                $actorWhere = ActorMigration::newMigration()->getWhere( $dbr, 'rev_user', $this );
                $count = (int)$dbr->selectField(
                        [ 'revision' ] + $actorWhere['tables'],