https://www.mediawiki.org/wiki/Special:Code/MediaWiki/109858
Revision: 109858
Author: demon
Date: 2012-01-23 22:24:01 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Fix for r109805, r109341: properly escape messages
Modified Paths:
--------------
trunk/extensions/Blackout/skins/ProtestSopa.php
trunk/extensions/Blackout/skins/SopaStrike.php
trunk/extensions/Blackout/skins/StopSopa.php
Modified: trunk/extensions/Blackout/skins/ProtestSopa.php
===================================================================
--- trunk/extensions/Blackout/skins/ProtestSopa.php 2012-01-23 22:05:25 UTC
(rev 109857)
+++ trunk/extensions/Blackout/skins/ProtestSopa.php 2012-01-23 22:24:01 UTC
(rev 109858)
@@ -12,13 +12,13 @@
* to show the actual HTML output
*/
public function execute() {
- $header = wfMsg( 'blackout-protestsopa-header', escape );
- $message1 = wfMsg( 'blackout-protestsopa-message1', escape );
- $message2 = wfMsg( 'blackout-protestsopa-message2', escape );
- $message3 = wfMsg( 'blackout-protestsopa-message3', escape );
- $action = wfMsg( 'blackout-protestsopa-action', escape );
- $actionmsg = wfMsg( 'blackout-protestsopa-actionmsg', escape );
- $join = wfMsg( 'blackout-protestsopa-join', escape );
+ $header = wfMsgHtml( 'blackout-protestsopa-header' );
+ $message1 = wfMsgHtml( 'blackout-protestsopa-message1' );
+ $message2 = wfMsgHtml( 'blackout-protestsopa-message2' );
+ $message3 = wfMsgHtml( 'blackout-protestsopa-message3' );
+ $action = wfMsgHtml( 'blackout-protestsopa-action' );
+ $actionmsg = wfMsgHtml( 'blackout-protestsopa-actionmsg' );
+ $join = wfMsgHtml( 'blackout-protestsopa-join' );
?>
<html>
Modified: trunk/extensions/Blackout/skins/SopaStrike.php
===================================================================
--- trunk/extensions/Blackout/skins/SopaStrike.php 2012-01-23 22:05:25 UTC
(rev 109857)
+++ trunk/extensions/Blackout/skins/SopaStrike.php 2012-01-23 22:24:01 UTC
(rev 109858)
@@ -12,28 +12,28 @@
* to show the actual HTML output
*/
public function execute() {
- $title = wfMsg( 'blackout-sopastrike-title', escape );
- $ogdesc = wfMsg( 'blackout-sopastrike-ogdesc', escape );
- $message1 = wfMsg( 'blackout-sopastrike-message1', escape );
- $message2 = wfMsg( 'blackout-sopastrike-message2', escape );
- $message3 = wfMsg( 'blackout-sopastrike-message3', escape );
- $name = wfMsg( 'allmessagesname', escape );
- $email = wfMsg( 'email', escape );
- $address = wfMsg( 'blackout-sopastrike-address', escape );
- $zipcode = wfMsg( 'blackout-sopastrike-zipcode', escape );
- $action = wfMsg( 'blackout-sopastrike-action', escape );
- $actionmsg1 = wfMsg( 'blackout-sopastrike-actionmsg1', escape );
- $actionmsg2 = wfMsg( 'blackout-sopastrike-actionmsg2', escape );
- $join = wfMsg( 'blackout-sopastrike-join', escape );
- $add = wfMsg( 'blackout-sopastrike-add', escape );
- $learn = wfMsg( 'blackout-sopastrike-learn', escape );
- $video = wfMsg( 'blackout-sopastrike-video', escape );
- $orgpage = wfMsg( 'blackout-sopastrike-orgpage' );
- $infographic = wfMsg( 'blackout-sopastrike-infographic', escape
);
- $ocsopa = wfMsg( 'blackout-sopastrike-ocsopa', escape );
- $ocpipa = wfMsg( 'blackout-sopastrike-ocpipa', escape );
- $disclaimer = wfMsg( 'blackout-sopastrike-disclaimer', escape );
- $privacy = wfMsg( 'blackout-sopastrike-privacy', escape );
+ $title = wfMsgHtml( 'blackout-sopastrike-title' );
+ $ogdesc = wfMsgHtml( 'blackout-sopastrike-ogdesc' );
+ $message1 = wfMsgHtml( 'blackout-sopastrike-message1' );
+ $message2 = wfMsgHtml( 'blackout-sopastrike-message2' );
+ $message3 = wfMsgHtml( 'blackout-sopastrike-message3' );
+ $name = wfMsgHtml( 'allmessagesname' );
+ $email = wfMsgHtml( 'email' );
+ $address = wfMsgHtml( 'blackout-sopastrike-address' );
+ $zipcode = wfMsgHtml( 'blackout-sopastrike-zipcode' );
+ $action = wfMsgHtml( 'blackout-sopastrike-action' );
+ $actionmsg1 = wfMsgHtml( 'blackout-sopastrike-actionmsg1' );
+ $actionmsg2 = wfMsgHtml( 'blackout-sopastrike-actionmsg2' );
+ $join = wfMsgHtml( 'blackout-sopastrike-join' );
+ $add = wfMsgHtml( 'blackout-sopastrike-add' );
+ $learn = wfMsgHtml( 'blackout-sopastrike-learn' );
+ $video = wfMsgHtml( 'blackout-sopastrike-video' );
+ $orgpage = wfMsgHtml( 'blackout-sopastrike-orgpage' );
+ $infographic = wfMsgHtml( 'blackout-sopastrike-infographic' );
+ $ocsopa = wfMsgHtml( 'blackout-sopastrike-ocsopa' );
+ $ocpipa = wfMsgHtml( 'blackout-sopastrike-ocpipa' );
+ $disclaimer = wfMsgHtml( 'blackout-sopastrike-disclaimer' );
+ $privacy = wfMsgHtml( 'blackout-sopastrike-privacy' );
?>
<!DOCTYPE html>
Modified: trunk/extensions/Blackout/skins/StopSopa.php
===================================================================
--- trunk/extensions/Blackout/skins/StopSopa.php 2012-01-23 22:05:25 UTC
(rev 109857)
+++ trunk/extensions/Blackout/skins/StopSopa.php 2012-01-23 22:24:01 UTC
(rev 109858)
@@ -12,8 +12,8 @@
* to show the actual HTML output
*/
public function execute() {
- $header = wfMsgExt( 'blackout-stopsopa-header', escape );
- $message = wfMsgExt( 'blackout-stopsopa-message', escape );
+ $header = wfMsgHtml( 'blackout-stopsopa-header' );
+ $message = wfMsgHtml( 'blackout-stopsopa-message' );
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
