X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=maintenance%2FgenerateSitemap.php;h=dc1de4f48078ebcd185a446accee20b04592d000;hp=ff3e2fce1a07fe9df8c48f21323b853d159ea11e;hb=1dee28cb5f1efd6d9e14d6cc1d0c73c3f69269b4;hpb=18a6b556b3c595bd0ced99316280094e77ab4a7e

diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php
index ff3e2fce1a..dc1de4f480 100644
--- a/maintenance/generateSitemap.php
+++ b/maintenance/generateSitemap.php
@@ -26,6 +26,8 @@
  * @see http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd
  */
 
+use MediaWiki\MediaWikiServices;
+
 require_once __DIR__ . '/Maintenance.php';
 
 /**
@@ -316,7 +318,7 @@ class GenerateSitemap extends Maintenance {
 	 * Main loop
 	 */
 	public function main() {
-		global $wgContLang;
+		$contLang = MediaWikiServices::getInstance()->getContentLanguage();
 
 		fwrite( $this->findex, $this->openIndex() );
 
@@ -327,7 +329,7 @@ class GenerateSitemap extends Maintenance {
 			$length = $this->limit[0];
 			$i = $smcount = 0;
 
-			$fns = $wgContLang->getFormattedNsText( $namespace );
+			$fns = $contLang->getFormattedNsText( $namespace );
 			$this->output( "$namespace ($fns)\n" );
 			$skippedRedirects = 0; // Number of redirects skipped for that namespace
 			foreach ( $res as $row ) {
@@ -358,10 +360,10 @@ class GenerateSitemap extends Maintenance {
 				$length += strlen( $entry );
 				$this->write( $this->file, $entry );
 				// generate pages for language variants
-				if ( $wgContLang->hasVariants() ) {
-					$variants = $wgContLang->getVariants();
+				if ( $contLang->hasVariants() ) {
+					$variants = $contLang->getVariants();
 					foreach ( $variants as $vCode ) {
-						if ( $vCode == $wgContLang->getCode() ) {
+						if ( $vCode == $contLang->getCode() ) {
 							continue; // we don't want default variant
 						}
 						$entry = $this->fileEntry(
@@ -483,7 +485,9 @@ class GenerateSitemap extends Maintenance {
 	 */
 	function indexEntry( $filename ) {
 		return "\t<sitemap>\n" .
-			"\t\t<loc>{$this->urlpath}$filename</loc>\n" .
+			"\t\t<loc>" . wfGetServerUrl( PROTO_CANONICAL ) .
+				( substr( $this->urlpath, 0, 1 ) === "/" ? "" : "/" ) .
+				"{$this->urlpath}$filename</loc>\n" .
 			"\t\t<lastmod>{$this->timestamp}</lastmod>\n" .
 			"\t</sitemap>\n";
 	}