r109858 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r109857‎ | r109858 | r109859 >
Date:22:24, 23 January 2012
Author:demon
Status:ok
Tags:
Comment:
Fix for r109805, r109341: properly escape messages
Modified paths:
  • /trunk/extensions/Blackout/skins/ProtestSopa.php (modified) (history)
  • /trunk/extensions/Blackout/skins/SopaStrike.php (modified) (history)
  • /trunk/extensions/Blackout/skins/StopSopa.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Blackout/skins/ProtestSopa.php
@@ -12,13 +12,13 @@
1313 * to show the actual HTML output
1414 */
1515 public function execute() {
16 - $header = wfMsg( 'blackout-protestsopa-header', escape );
17 - $message1 = wfMsg( 'blackout-protestsopa-message1', escape );
18 - $message2 = wfMsg( 'blackout-protestsopa-message2', escape );
19 - $message3 = wfMsg( 'blackout-protestsopa-message3', escape );
20 - $action = wfMsg( 'blackout-protestsopa-action', escape );
21 - $actionmsg = wfMsg( 'blackout-protestsopa-actionmsg', escape );
22 - $join = wfMsg( 'blackout-protestsopa-join', escape );
 16+ $header = wfMsgHtml( 'blackout-protestsopa-header' );
 17+ $message1 = wfMsgHtml( 'blackout-protestsopa-message1' );
 18+ $message2 = wfMsgHtml( 'blackout-protestsopa-message2' );
 19+ $message3 = wfMsgHtml( 'blackout-protestsopa-message3' );
 20+ $action = wfMsgHtml( 'blackout-protestsopa-action' );
 21+ $actionmsg = wfMsgHtml( 'blackout-protestsopa-actionmsg' );
 22+ $join = wfMsgHtml( 'blackout-protestsopa-join' );
2323 ?>
2424
2525 <html>
Index: trunk/extensions/Blackout/skins/SopaStrike.php
@@ -12,28 +12,28 @@
1313 * to show the actual HTML output
1414 */
1515 public function execute() {
16 - $title = wfMsg( 'blackout-sopastrike-title', escape );
17 - $ogdesc = wfMsg( 'blackout-sopastrike-ogdesc', escape );
18 - $message1 = wfMsg( 'blackout-sopastrike-message1', escape );
19 - $message2 = wfMsg( 'blackout-sopastrike-message2', escape );
20 - $message3 = wfMsg( 'blackout-sopastrike-message3', escape );
21 - $name = wfMsg( 'allmessagesname', escape );
22 - $email = wfMsg( 'email', escape );
23 - $address = wfMsg( 'blackout-sopastrike-address', escape );
24 - $zipcode = wfMsg( 'blackout-sopastrike-zipcode', escape );
25 - $action = wfMsg( 'blackout-sopastrike-action', escape );
26 - $actionmsg1 = wfMsg( 'blackout-sopastrike-actionmsg1', escape );
27 - $actionmsg2 = wfMsg( 'blackout-sopastrike-actionmsg2', escape );
28 - $join = wfMsg( 'blackout-sopastrike-join', escape );
29 - $add = wfMsg( 'blackout-sopastrike-add', escape );
30 - $learn = wfMsg( 'blackout-sopastrike-learn', escape );
31 - $video = wfMsg( 'blackout-sopastrike-video', escape );
32 - $orgpage = wfMsg( 'blackout-sopastrike-orgpage' );
33 - $infographic = wfMsg( 'blackout-sopastrike-infographic', escape );
34 - $ocsopa = wfMsg( 'blackout-sopastrike-ocsopa', escape );
35 - $ocpipa = wfMsg( 'blackout-sopastrike-ocpipa', escape );
36 - $disclaimer = wfMsg( 'blackout-sopastrike-disclaimer', escape );
37 - $privacy = wfMsg( 'blackout-sopastrike-privacy', escape );
 16+ $title = wfMsgHtml( 'blackout-sopastrike-title' );
 17+ $ogdesc = wfMsgHtml( 'blackout-sopastrike-ogdesc' );
 18+ $message1 = wfMsgHtml( 'blackout-sopastrike-message1' );
 19+ $message2 = wfMsgHtml( 'blackout-sopastrike-message2' );
 20+ $message3 = wfMsgHtml( 'blackout-sopastrike-message3' );
 21+ $name = wfMsgHtml( 'allmessagesname' );
 22+ $email = wfMsgHtml( 'email' );
 23+ $address = wfMsgHtml( 'blackout-sopastrike-address' );
 24+ $zipcode = wfMsgHtml( 'blackout-sopastrike-zipcode' );
 25+ $action = wfMsgHtml( 'blackout-sopastrike-action' );
 26+ $actionmsg1 = wfMsgHtml( 'blackout-sopastrike-actionmsg1' );
 27+ $actionmsg2 = wfMsgHtml( 'blackout-sopastrike-actionmsg2' );
 28+ $join = wfMsgHtml( 'blackout-sopastrike-join' );
 29+ $add = wfMsgHtml( 'blackout-sopastrike-add' );
 30+ $learn = wfMsgHtml( 'blackout-sopastrike-learn' );
 31+ $video = wfMsgHtml( 'blackout-sopastrike-video' );
 32+ $orgpage = wfMsgHtml( 'blackout-sopastrike-orgpage' );
 33+ $infographic = wfMsgHtml( 'blackout-sopastrike-infographic' );
 34+ $ocsopa = wfMsgHtml( 'blackout-sopastrike-ocsopa' );
 35+ $ocpipa = wfMsgHtml( 'blackout-sopastrike-ocpipa' );
 36+ $disclaimer = wfMsgHtml( 'blackout-sopastrike-disclaimer' );
 37+ $privacy = wfMsgHtml( 'blackout-sopastrike-privacy' );
3838 ?>
3939
4040 <!DOCTYPE html>
Index: trunk/extensions/Blackout/skins/StopSopa.php
@@ -12,8 +12,8 @@
1313 * to show the actual HTML output
1414 */
1515 public function execute() {
16 - $header = wfMsgExt( 'blackout-stopsopa-header', escape );
17 - $message = wfMsgExt( 'blackout-stopsopa-message', escape );
 16+ $header = wfMsgHtml( 'blackout-stopsopa-header' );
 17+ $message = wfMsgHtml( 'blackout-stopsopa-message' );
1818 ?>
1919
2020 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r109341localisationvarnent08:11, 18 January 2012
r109805Outputs escaped per r109341varnent03:22, 23 January 2012

Status & tagging log