X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FimportSiteScripts.php;h=5dfd2a87954429a3372296832d8c060e989235c5;hb=cbf5bacae5f1a81854cd41bee34bee1ac3a76f49;hp=7705ec9cabd41c2c721d80a9da9acdbdcc76679d;hpb=b2645d82849ca74b0e6b8df6a3e28e81d0561a58;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importSiteScripts.php b/maintenance/importSiteScripts.php
index 7705ec9cab..5dfd2a8795 100644
--- a/maintenance/importSiteScripts.php
+++ b/maintenance/importSiteScripts.php
@@ -41,7 +41,12 @@ class ImportSiteScripts extends Maintenance {
 	public function execute() {
 		global $wgUser;
 
-		$user = User::newFromName( $this->getOption( 'username', 'ScriptImporter' ) );
+		$username = $this->getOption( 'username', false );
+		if ( $username === false ) {
+			$user = User::newSystemUser( 'ScriptImporter', array( 'steal' => true ) );
+		} else {
+			$user = User::newFromName( $username );
+		}
 		$wgUser = $user;
 
 		$baseUrl = $this->getArg( 1 );
@@ -59,7 +64,7 @@ class ImportSiteScripts extends Maintenance {
 			$url = wfAppendQuery( $baseUrl, array(
 				'action' => 'raw',
 				'title' => "MediaWiki:{$page}" ) );
-			$text = Http::get( $url );
+			$text = Http::get( $url, array(), __METHOD__ );
 
 			$wikiPage = WikiPage::factory( $title );
 			$content = ContentHandler::makeContent( $text, $wikiPage->getTitle() );
@@ -70,33 +75,40 @@ class ImportSiteScripts extends Maintenance {
 	protected function fetchScriptList() {
 		$data = array(
 			'action' => 'query',
-			'format' => 'php', //'json',
+			'format' => 'json',
 			'list' => 'allpages',
 			'apnamespace' => '8',
 			'aplimit' => '500',
+			'continue' => '',
 		);
 		$baseUrl = $this->getArg( 0 );
 		$pages = array();
 
-		do {
+		while ( true ) {
 			$url = wfAppendQuery( $baseUrl, $data );
-			$strResult = Http::get( $url );
-			//$result = FormatJson::decode( $strResult ); // Still broken
-			$result = unserialize( $strResult );
+			$strResult = Http::get( $url, array(), __METHOD__ );
+			$result = FormatJson::decode( $strResult, true );
 
-			if ( !empty( $result['query']['allpages'] ) ) {
-				foreach ( $result['query']['allpages'] as $page ) {
-					if ( substr( $page['title'], -3 ) === '.js' ) {
-						strtok( $page['title'], ':' );
-						$pages[] = strtok( '' );
-					}
+			$page = null;
+			foreach ( $result['query']['allpages'] as $page ) {
+				if ( substr( $page['title'], -3 ) === '.js' ) {
+					strtok( $page['title'], ':' );
+					$pages[] = strtok( '' );
 				}
 			}
-			if ( !empty( $result['query-continue'] ) ) {
-				$data['apfrom'] = $result['query-continue']['allpages']['apfrom'];
-				$this->output( "Fetching new batch from {$data['apfrom']}\n" );
+
+			if ( $page !== null ) {
+				$this->output( "Fetched list up to {$page['title']}\n" );
 			}
-		} while ( isset( $result['query-continue'] ) );
+
+			if ( isset( $result['continue'] ) ) { // >= 1.21
+				$data = array_replace( $data, $result['continue'] );
+			} elseif ( isset( $result['query-continue']['allpages'] ) ) { // <= 1.20
+				$data = array_replace( $data, $result['query-continue']['allpages'] );
+			} else {
+				break;
+			}
+		}
 
 		return $pages;
 	}