X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FimportSiteScripts.php;h=fd768b347f77fe015bcefbbe5270dfc96925619d;hb=688200c607640e77029d171803a7a72832519aa2;hp=e25ee2be64d190bf05d6a245e17526f7e0a6f78b;hpb=72952a082cdd438d0605cf77f1db0330a821ceb2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importSiteScripts.php b/maintenance/importSiteScripts.php
index e25ee2be64..fd768b347f 100644
--- a/maintenance/importSiteScripts.php
+++ b/maintenance/importSiteScripts.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script to import all scripts in the MediaWiki namespace from a
@@ -56,12 +56,9 @@ class ImportSiteScripts extends Maintenance {
 			}
 
 			$this->output( "Importing $page\n" );
-			$uri = new Uri( $baseUrl );
-			$uri->extendQuery( array(
+			$url = wfAppendQuery( $baseUrl, array(
 				'action' => 'raw',
 				'title' => "MediaWiki:{$page}" ) );
-			$url = $uri->toString();
-
 			$text = Http::get( $url );
 
 			$wikiPage = WikiPage::factory( $title );
@@ -83,9 +80,7 @@ class ImportSiteScripts extends Maintenance {
 		$pages = array();
 
 		do {
-			$uri = new Uri( $baseUrl );
-			$uri->extendQuery( $data );
-			$url = $uri->toString();
+			$url = wfAppendQuery( $baseUrl, $data );
 			$strResult = Http::get( $url );
 			//$result = FormatJson::decode( $strResult ); // Still broken
 			$result = unserialize( $strResult );
@@ -110,4 +105,4 @@ class ImportSiteScripts extends Maintenance {
 }
 
 $maintClass = 'ImportSiteScripts';
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;