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 "MWHttpRequest: Restore ability to pass null for $options"
[lhc/web/wiklou.git]
/
maintenance
/
moveBatch.php
diff --git
a/maintenance/moveBatch.php
b/maintenance/moveBatch.php
index
d578a49
..
090c3d4
100644
(file)
--- a/
maintenance/moveBatch.php
+++ b/
maintenance/moveBatch.php
@@
-73,7
+73,7
@@
class MoveBatch extends Maintenance {
# Setup
if ( !$file ) {
# Setup
if ( !$file ) {
- $this->
error( "Unable to read file, exiting", true
);
+ $this->
fatalError( "Unable to read file, exiting"
);
}
if ( $user === false ) {
$wgUser = User::newSystemUser( 'Move page script', [ 'steal' => true ] );
}
if ( $user === false ) {
$wgUser = User::newSystemUser( 'Move page script', [ 'steal' => true ] );
@@
-81,14
+81,13
@@
class MoveBatch extends Maintenance {
$wgUser = User::newFromName( $user );
}
if ( !$wgUser ) {
$wgUser = User::newFromName( $user );
}
if ( !$wgUser ) {
- $this->
error( "Invalid username", true
);
+ $this->
fatalError( "Invalid username"
);
}
# Setup complete, now start
$dbw = $this->getDB( DB_MASTER );
}
# Setup complete, now start
$dbw = $this->getDB( DB_MASTER );
- //
@codingStandardsIgnoreStart Ignore avoid function calls in a FOR loop test part warning
+ //
phpcs:ignore Generic.CodeAnalysis.ForLoopWithTestFunctionCall
for ( $linenum = 1; !feof( $file ); $linenum++ ) {
for ( $linenum = 1; !feof( $file ); $linenum++ ) {
- // @codingStandardsIgnoreEnd
$line = fgets( $file );
if ( $line === false ) {
break;
$line = fgets( $file );
if ( $line === false ) {
break;
@@
-123,5
+122,5
@@
class MoveBatch extends Maintenance {
}
}
}
}
-$maintClass =
"MoveBatch"
;
+$maintClass =
MoveBatch::class
;
require_once RUN_MAINTENANCE_IF_MAIN;
require_once RUN_MAINTENANCE_IF_MAIN;