From: umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 27 Jun 2014 15:12:37 +0000 (+0200)
Subject: Replace deprecated Title::escapeCanonicalURL call
X-Git-Tag: 1.31.0-rc.0~15186^2
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=4634b572433980d9c78ff662f0af0b0c05c00f90;p=lhc%2Fweb%2Fwiklou.git

Replace deprecated Title::escapeCanonicalURL call

Change-Id: Icd3e2304d6188babe2d887aa32fc0c398352b7b6
---

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 3425b6bb7c..cde7a2d83e 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -242,7 +242,12 @@ class CoreParserFunctions {
 	}
 
 	static function canonicalurle( $parser, $s = '', $arg = null ) {
-		return self::urlFunction( 'escapeCanonicalURL', $s, $arg );
+		$temp = self::urlFunction( 'getCanonicalURL', $s, $arg );
+		if ( !is_string( $temp ) ) {
+			return $temp;
+		} else {
+			return htmlspecialchars( $temp );
+		}
 	}
 
 	static function urlFunction( $func, $s = '', $arg = null ) {