dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deprecate Parser::replaceLinkHolders / replaceLinkHoldersText
[lhc/web/wiklou.git]
/
maintenance
/
userDupes.inc
diff --git
a/maintenance/userDupes.inc
b/maintenance/userDupes.inc
index
038ef23
..
cbe5d27
100644
(file)
--- a/
maintenance/userDupes.inc
+++ b/
maintenance/userDupes.inc
@@
-36,7
+36,7
@@
use Wikimedia\Rdbms\IMaintainableDatabase;
*/
class UserDupes {
/**
*/
class UserDupes {
/**
- * @var Database
+ * @var
IMaintainable
Database
*/
private $db;
private $reassigned;
*/
private $db;
private $reassigned;
@@
-110,8
+110,9
@@
class UserDupes {
* @return bool
*/
private function checkDupes( $doDelete = false ) {
* @return bool
*/
private function checkDupes( $doDelete = false ) {
+ $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId();
if ( $this->hasUniqueIndex() ) {
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;
}
return true;
}
@@
-122,7
+123,7
@@
class UserDupes {
$dupes = $this->getDupes();
$count = count( $dupes );
$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;
$this->trimmed = 0;
$this->reassigned = 0;
$this->failed = 0;
@@
-145,11
+146,13
@@
class UserDupes {
if ( $this->trimmed > 0 ) {
if ( $doDelete ) {
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 {
} 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"
+ );
}
}
}
}