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
Merge "easydeflate.js: Use LF instead of CRLF as newline"
[lhc/web/wiklou.git]
/
maintenance
/
namespaceDupes.php
diff --git
a/maintenance/namespaceDupes.php
b/maintenance/namespaceDupes.php
index
3c83921
..
71241e7
100644
(file)
--- a/
maintenance/namespaceDupes.php
+++ b/
maintenance/namespaceDupes.php
@@
-37,7
+37,7
@@
use Wikimedia\Rdbms\IMaintainableDatabase;
*
* @ingroup Maintenance
*/
*
* @ingroup Maintenance
*/
-class Namespace
ConflictChecker
extends Maintenance {
+class Namespace
Dupes
extends Maintenance {
/**
* @var IMaintainableDatabase
/**
* @var IMaintainableDatabase
@@
-161,17
+161,8
@@
class NamespaceConflictChecker extends Maintenance {
// break the tie by sorting by name
$origSpaces = $spaces;
uksort( $spaces, function ( $a, $b ) use ( $origSpaces ) {
// break the tie by sorting by name
$origSpaces = $spaces;
uksort( $spaces, function ( $a, $b ) use ( $origSpaces ) {
- if ( $origSpaces[$a] < $origSpaces[$b] ) {
- return -1;
- } elseif ( $origSpaces[$a] > $origSpaces[$b] ) {
- return 1;
- } elseif ( $a < $b ) {
- return -1;
- } elseif ( $a > $b ) {
- return 1;
- } else {
- return 0;
- }
+ return $origSpaces[$a] <=> $origSpaces[$b]
+ ?: $a <=> $b;
} );
$ok = true;
} );
$ok = true;
@@
-616,5
+607,5
@@
class NamespaceConflictChecker extends Maintenance {
}
}
}
}
-$maintClass = Namespace
ConflictChecker
::class;
+$maintClass = Namespace
Dupes
::class;
require_once RUN_MAINTENANCE_IF_MAIN;
require_once RUN_MAINTENANCE_IF_MAIN;