X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FuserDupes.inc;h=cbe5d27dc010c15831db66cc7693191b4acbfc33;hb=9ddd146c262806e993ea66994f367a0a795e762d;hp=5f7f9d5e434cdaf86cf2f6a716ba3cc3aa6359e3;hpb=0ae01716c36bd03192a6dc79816beee8a0a74fa5;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/userDupes.inc b/maintenance/userDupes.inc index 5f7f9d5e43..cbe5d27dc0 100644 --- a/maintenance/userDupes.inc +++ b/maintenance/userDupes.inc @@ -110,8 +110,9 @@ class UserDupes { * @return bool */ private function checkDupes( $doDelete = false ) { + $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId(); if ( $this->hasUniqueIndex() ) { - echo wfWikiID() . " already has a unique index on its user table.\n"; + echo "$dbDomain already has a unique index on its user table.\n"; return true; } @@ -122,7 +123,7 @@ class UserDupes { $dupes = $this->getDupes(); $count = count( $dupes ); - $this->out( "Found $count accounts with duplicate records on " . wfWikiID() . ".\n" ); + $this->out( "Found $count accounts with duplicate records on $dbDomain.\n" ); $this->trimmed = 0; $this->reassigned = 0; $this->failed = 0; @@ -145,11 +146,13 @@ class UserDupes { if ( $this->trimmed > 0 ) { if ( $doDelete ) { - $this->out( "$this->trimmed duplicate user records were deleted from " - . wfWikiID() . ".\n" ); + $this->out( + "$this->trimmed duplicate user records were deleted from $dbDomain.\n" ); } else { - $this->out( "$this->trimmed duplicate user accounts were found on " - . wfWikiID() . " which can be removed safely.\n" ); + $this->out( + "$this->trimmed duplicate user accounts were found on $dbDomain " . + "which can be removed safely.\n" + ); } }