X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FimportTextFile.php;h=e081c20bc13a84045e1b5a7a5e46b7aa8fafe8ea;hb=413939b37b4ff8fc1ddb0ea6ed70e436f81e2349;hp=5623fb06c2f8b045359dd11ae6e3dec1b666f375;hpb=3d0215c357b8b11a7a8e7bdcbcc178fc4fa70ca9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importTextFile.php b/maintenance/importTextFile.php
index 5623fb06c2..e081c20bc1 100644
--- a/maintenance/importTextFile.php
+++ b/maintenance/importTextFile.php
@@ -24,15 +24,15 @@
 
 $options = array( 'help', 'nooverwrite', 'norc' );
 $optionsWithArgs = array( 'title', 'user', 'comment' );
-require_once( dirname( __FILE__ ) . '/commandLine.inc' );
-echo( "Import Text File\n\n" );
+require_once __DIR__ . '/commandLine.inc';
+echo "Import Text File\n\n";
 
 if ( count( $args ) < 1 || isset( $options['help'] ) ) {
 	showHelp();
 } else {
 
 	$filename = $args[0];
-	echo( "Using {$filename}..." );
+	echo "Using {$filename}...";
 	if ( is_file( $filename ) ) {
 
 		$title = isset( $options['title'] ) ? $options['title'] : titleFromFilename( $filename );
@@ -40,7 +40,7 @@ if ( count( $args ) < 1 || isset( $options['help'] ) ) {
 
 		if ( is_object( $title ) ) {
 
-			echo( "\nUsing title '" . $title->getPrefixedText() . "'..." );
+			echo "\nUsing title '" . $title->getPrefixedText() . "'...";
 			if ( !$title->exists() || !isset( $options['nooverwrite'] ) ) {
 
 				$text = file_get_contents( $filename );
@@ -49,30 +49,31 @@ if ( count( $args ) < 1 || isset( $options['help'] ) ) {
 
 				if ( is_object( $user ) ) {
 
-					echo( "\nUsing username '" . $user->getName() . "'..." );
+					echo "\nUsing username '" . $user->getName() . "'...";
 					$wgUser =& $user;
 					$comment = isset( $options['comment'] ) ? $options['comment'] : 'Importing text file';
 					$flags = 0 | ( isset( $options['norc'] ) ? EDIT_SUPPRESS_RC : 0 );
 
-					echo( "\nPerforming edit..." );
+					echo "\nPerforming edit...";
 					$page = WikiPage::factory( $title );
-					$page->doEdit( $text, $comment, $flags, false, $user );
-					echo( "done.\n" );
+					$content = ContentHandler::makeContent( $text, $title );
+					$page->doEditContent( $content, $comment, $flags, false, $user );
+					echo "done.\n";
 
 				} else {
-					echo( "invalid username.\n" );
+					echo "invalid username.\n";
 				}
 
 			} else {
-				echo( "page exists.\n" );
+				echo "page exists.\n";
 			}
 
 		} else {
-			echo( "invalid title.\n" );
+			echo "invalid title.\n";
 		}
 
 	} else {
-		echo( "does not exist.\n" );
+		echo "does not exist.\n";
 	}
 
 }