X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FimportSiteScripts.php;h=6566a60d9727ddc02b0278cf9104f67c7efe8e88;hb=64717f414cdd66a27630b92539cde5456d622141;hp=7705ec9cabd41c2c721d80a9da9acdbdcc76679d;hpb=0ff2c62197fdaf79f82d8657afd70621725c9762;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importSiteScripts.php b/maintenance/importSiteScripts.php
index 7705ec9cab..6566a60d97 100644
--- a/maintenance/importSiteScripts.php
+++ b/maintenance/importSiteScripts.php
@@ -59,7 +59,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 +70,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" );
+			}
+
+			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;
 			}
-		} while ( isset( $result['query-continue'] ) );
+		}
 
 		return $pages;
 	}