[MediaWiki-commits] [Gerrit] Replace deprecated Title::escapeCanonicalURL call - change (mediawiki/core)

2014-06-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Replace deprecated Title::escapeCanonicalURL call
..


Replace deprecated Title::escapeCanonicalURL call

Change-Id: Icd3e2304d6188babe2d887aa32fc0c398352b7b6
---
M includes/parser/CoreParserFunctions.php
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/parser/CoreParserFunctions.php 
b/includes/parser/CoreParserFunctions.php
index 3425b6b..cde7a2d 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -242,7 +242,12 @@
}
 
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 ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/142536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icd3e2304d6188babe2d887aa32fc0c398352b7b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Replace deprecated Title::escapeCanonicalURL call - change (mediawiki/core)

2014-06-27 Thread Umherirrender (Code Review) 
Umherirrender has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/142536

Change subject: Replace deprecated Title::escapeCanonicalURL call
..

Replace deprecated Title::escapeCanonicalURL call

Change-Id: Icd3e2304d6188babe2d887aa32fc0c398352b7b6
---
M includes/parser/CoreParserFunctions.php
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/142536/1

diff --git a/includes/parser/CoreParserFunctions.php 
b/includes/parser/CoreParserFunctions.php
index 3425b6b..cde7a2d 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -242,7 +242,12 @@
}
 
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 ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/142536
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd3e2304d6188babe2d887aa32fc0c398352b7b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits