X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FimportTextFiles.php;h=5531ffc3afb0e124e843110c0d8ea2177979e578;hb=94f52cb76fd07d4a175bffe17320a598d07f5bd6;hp=70b65744db3a8b993ea23faa080d29942efb4b6c;hpb=4b069cd1b88877fbb253af8780e358d96ba2587c;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/importTextFiles.php b/maintenance/importTextFiles.php index 70b65744db..5531ffc3af 100644 --- a/maintenance/importTextFiles.php +++ b/maintenance/importTextFiles.php @@ -56,14 +56,23 @@ class ImportTextFiles extends Maintenance { $prefix = $this->getOption( 'prefix', '' ); // Get all the arguments. A loop is required since Maintenance doesn't - // suppport an arbitrary number of arguments. - $files = array(); + // support an arbitrary number of arguments. + $files = []; $i = 0; while ( $arg = $this->getArg( $i++ ) ) { if ( file_exists( $arg ) ) { $files[$arg] = file_get_contents( $arg ); } else { - $this->error( "Fatal error: The file '$arg' does not exist!", 1 ); + // use glob to support the Windows shell, which doesn't automatically + // expand wildcards + $found = false; + foreach ( glob( $arg ) as $filename ) { + $found = true; + $files[$filename] = file_get_contents( $filename ); + } + if ( !$found ) { + $this->error( "Fatal error: The file '$arg' does not exist!", 1 ); + } } }; @@ -71,7 +80,7 @@ class ImportTextFiles extends Maintenance { $this->output( "Importing $count pages...\n" ); if ( $userName === false ) { - $user = User::newSystemUser( 'Maintenance script', array( 'steal' => true ) ); + $user = User::newSystemUser( 'Maintenance script', [ 'steal' => true ] ); } else { $user = User::newFromName( $userName ); }