From: Liangent <liangent@gmail.com>
Date: Sun, 12 May 2013 15:36:59 +0000 (+0000)
Subject: (bug 34666) Escape URLs in XML files created by generateSitemap.php
X-Git-Tag: 1.31.0-rc.0~19699^2
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=21bafdfa24c40af12fa7c4733c1097ee09d75374;p=lhc%2Fweb%2Fwiklou.git

(bug 34666) Escape URLs in XML files created by generateSitemap.php

Bug: 34666
Change-Id: Ifb6ddb0bc6ca03c411f938837b2f89a5a30e4fc3
---

diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php
index 75907add62..86fb97af93 100644
--- a/maintenance/generateSitemap.php
+++ b/maintenance/generateSitemap.php
@@ -490,7 +490,8 @@ class GenerateSitemap extends Maintenance {
 	function fileEntry( $url, $date, $priority ) {
 		return
 			"\t<url>\n" .
-			"\t\t<loc>$url</loc>\n" .
+			// bug 34666: $url may contain bad characters such as ampersands.
+			"\t\t<loc>" . htmlspecialchars( $url ) . "</loc>\n" .
 			"\t\t<lastmod>$date</lastmod>\n" .
 			"\t\t<priority>$priority</priority>\n" .
 			"\t</url>\n";