[MediaWiki-commits] [Gerrit] Parse duplicate-defaultsort error message - change (mediawiki/core)

2013-07-04 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Parse duplicate-defaultsort error message
..


Parse duplicate-defaultsort error message

Bug: 49611
Change-Id: I2fd6c74597ba423378c3f08e76248c2b241098dd
---
M includes/parser/CoreParserFunctions.php
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  CSteipp: Looks good to me, but someone else must approve
  Matmarex: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/parser/CoreParserFunctions.php 
b/includes/parser/CoreParserFunctions.php
index a7820d4..41cbd08 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -862,7 +862,10 @@
return '';
} else {
return '' .
-   wfMessage( 'duplicate-defaultsort', $old, $text 
)->inContentLanguage()->escaped() .
+   wfMessage( 'duplicate-defaultsort',
+   wfEscapeWikiText( $old ), // Message 
should be parsed, but these params should only be escaped.
+   wfEscapeWikiText( $text )
+   )->inContentLanguage()->text() .
'';
}
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2fd6c74597ba423378c3f08e76248c2b241098dd
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 
Gerrit-Reviewer: CSteipp 
Gerrit-Reviewer: Daniel Friesen 
Gerrit-Reviewer: Liangent 
Gerrit-Reviewer: Matmarex 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Parse duplicate-defaultsort error message - change (mediawiki/core)

2013-06-15 Thread Alex Monk (Code Review) 
Alex Monk has uploaded a new change for review.

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


Change subject: Parse duplicate-defaultsort error message
..

Parse duplicate-defaultsort error message

Bug: 49611
Change-Id: I2fd6c74597ba423378c3f08e76248c2b241098dd
---
M includes/parser/CoreParserFunctions.php
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/68859/1

diff --git a/includes/parser/CoreParserFunctions.php 
b/includes/parser/CoreParserFunctions.php
index a7820d4..efcc52f 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -862,7 +862,10 @@
return '';
} else {
return '' .
-   wfMessage( 'duplicate-defaultsort', $old, $text 
)->inContentLanguage()->escaped() .
+   wfMessage( 'duplicate-defaultsort' )->rawParams(
+   htmlspecialchars( $old, ENT_QUOTES, 
'UTF-8', false ), // Message should be parsed, but these params should only be 
escaped.
+   htmlspecialchars( $text, ENT_QUOTES, 
'UTF-8', false )
+   )->inContentLanguage()->parse() .
'';
}
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fd6c74597ba423378c3f08e76248c2b241098dd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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