X-Git-Url: http://git.cyclocoop.org/%28?a=blobdiff_plain;f=maintenance%2FgenerateSitemap.php;h=7d43f218c80d6569851ee30448c5c78c6a43ff98;hb=2e1ac38485b9c78890944413cba074474c06bd34;hp=70fdebf403009bdd92f966f1228d615b9abc12ec;hpb=5410cfccce9b0b84bc909506c9b66d3f27d6dba7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php
index 70fdebf403..7d43f218c8 100644
--- a/maintenance/generateSitemap.php
+++ b/maintenance/generateSitemap.php
@@ -230,7 +230,7 @@ class GenerateSitemap extends Maintenance {
 		// Custom priorities
 		if ( $wgSitemapNamespacesPriorities !== false ) {
 			/**
-			 * @var $wgSitemapNamespacesPriorities array
+			 * @var array $wgSitemapNamespacesPriorities
 			 */
 			foreach ( $wgSitemapNamespacesPriorities as $namespace => $priority ) {
 				$float = floatval( $priority );
@@ -290,7 +290,7 @@ class GenerateSitemap extends Maintenance {
 	 * @return string
 	 */
 	function guessPriority( $namespace ) {
-		return MWNamespace::isSubject( $namespace )
+		return MediaWikiServices::getInstance()->getNamespaceInfo()->isSubject( $namespace )
 			? $this->priorities[self::GS_MAIN]
 			: $this->priorities[self::GS_TALK];
 	}
@@ -485,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";
 	}