X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=maintenance%2FimportTextFiles.php;h=c99aa155313b9a7321bda55aa57ca1853a6acb7f;hb=803f3867b7fcbb5fcee405f5c10cfa06cb857bd6;hp=2894653eb4dc19810b5e1f08ad159521cad826bf;hpb=bdfe02223205923d923923dd420ba0dd863cd0fe;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importTextFiles.php b/maintenance/importTextFiles.php
index 2894653eb4..c99aa15531 100644
--- a/maintenance/importTextFiles.php
+++ b/maintenance/importTextFiles.php
@@ -21,6 +21,8 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\MediaWikiServices;
+
 require_once __DIR__ . '/Maintenance.php';
 
 /**
@@ -71,7 +73,7 @@ class ImportTextFiles extends Maintenance {
 					$files[$filename] = file_get_contents( $filename );
 				}
 				if ( !$found ) {
-					$this->error( "Fatal error: The file '$arg' does not exist!", 1 );
+					$this->fatalError( "Fatal error: The file '$arg' does not exist!" );
 				}
 			}
 		};
@@ -86,7 +88,7 @@ class ImportTextFiles extends Maintenance {
 		}
 
 		if ( !$user ) {
-			$this->error( "Invalid username\n", true );
+			$this->fatalError( "Invalid username\n" );
 		}
 		if ( $user->isAnon() ) {
 			$user->addToDatabase();
@@ -129,7 +131,7 @@ class ImportTextFiles extends Maintenance {
 				}
 			}
 
-			$rev = new WikiRevision( ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) );
+			$rev = new WikiRevision( MediaWikiServices::getInstance()->getMainConfig() );
 			$rev->setText( rtrim( $text ) );
 			$rev->setTitle( $title );
 			$rev->setUserObj( $user );
@@ -197,10 +199,10 @@ class ImportTextFiles extends Maintenance {
 
 		$this->output( "Done! $successCount succeeded, $skipCount skipped.\n" );
 		if ( $exit ) {
-			$this->error( "Import failed with $failCount failed pages.\n", $exit );
+			$this->fatalError( "Import failed with $failCount failed pages.\n", $exit );
 		}
 	}
 }
 
-$maintClass = "ImportTextFiles";
+$maintClass = ImportTextFiles::class;
 require_once RUN_MAINTENANCE_IF_MAIN;