From: Jeroen De Dauw <jeroendedauw@users.mediawiki.org>
Date: Tue, 13 Dec 2011 04:58:48 +0000 (+0000)
Subject: rem use of escapeLocalURL
X-Git-Tag: 1.31.0-rc.0~26018
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=4544a783168f3f30f7078074b0335fce13929934;p=lhc%2Fweb%2Fwiklou.git

rem use of escapeLocalURL
---

diff --git a/includes/SkinLegacy.php b/includes/SkinLegacy.php
index f5bc9bfa76..56b2436425 100644
--- a/includes/SkinLegacy.php
+++ b/includes/SkinLegacy.php
@@ -247,7 +247,7 @@ class LegacyTemplate extends BaseTemplate {
 				}
 				$s = $wgLang->pipeList( array(
 					$s,
-					'<a href="' . $title->escapeLocalURL( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>'
+					'<a href="' . htmlspecialchars( $title->getLocalURL( 'variant=' . $code ) ) . '">' . htmlspecialchars( $varname ) . '</a>'
 				) );
 			}
 		}
diff --git a/includes/api/ApiFormatXml.php b/includes/api/ApiFormatXml.php
index 054784b1a4..8f4abc1533 100644
--- a/includes/api/ApiFormatXml.php
+++ b/includes/api/ApiFormatXml.php
@@ -201,7 +201,7 @@ class ApiFormatXml extends ApiFormatBase {
 			$this->setWarning( 'Stylesheet should have .xsl extension.' );
 			return;
 		}
-		$this->printText( '<?xml-stylesheet href="' . $nt->escapeLocalURL( 'action=raw' ) . '" type="text/xsl" ?>' );
+		$this->printText( '<?xml-stylesheet href="' . htmlspecialchars( $nt->getLocalURL( 'action=raw' ) ) . '" type="text/xsl" ?>' );
 	}
 
 	public function getAllowedParams() {
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index c3d8aa389c..ca02d6b756 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1176,7 +1176,7 @@ class Parser {
 			));
 			$titleObj = SpecialPage::getTitleFor( 'Booksources', $num );
 			return'<a href="' .
-				$titleObj->escapeLocalUrl() .
+				htmlspecialchars( $titleObj->getLocalUrl() ) .
 				"\" class=\"internal mw-magiclink-isbn\">ISBN $isbn</a>";
 		} else {
 			return $m[0];
diff --git a/includes/specials/SpecialAllpages.php b/includes/specials/SpecialAllpages.php
index bd83b55c0f..fb87e2ae97 100644
--- a/includes/specials/SpecialAllpages.php
+++ b/includes/specials/SpecialAllpages.php
@@ -278,7 +278,7 @@ class SpecialAllpages extends IncludableSpecialPage {
 
 		$queryparams = $namespace ? "namespace=$namespace&" : '';
 		$special = $this->getTitle();
-		$link = $special->escapeLocalUrl( $queryparams . 'from=' . urlencode($inpoint) . '&to=' . urlencode($outpoint) );
+		$link = htmlspecialchars( $special->getLocalUrl( $queryparams . 'from=' . urlencode($inpoint) . '&to=' . urlencode($outpoint) ) );
 
 		$out = $this->msg( 'alphaindexline' )->rawParams(
 			"<a href=\"$link\">$inpointf</a></td><td>",