Georggi199 has uploaded a new change for review.

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

Change subject: Replaced some wfMsg* deprecated functions.
......................................................................

Replaced some wfMsg* deprecated functions.

For gci2014, georggi, Bug T70750

Change-Id: Ie5eba6cbeeedc4900042c0a85fd9f94353ca4ec5
---
M skins/ProtestSopa.php
M skins/SopaStrike.php
M skins/StopSopa.php
3 files changed, 31 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Blackout 
refs/changes/82/181882/1

diff --git a/skins/ProtestSopa.php b/skins/ProtestSopa.php
index 79fb566..1b7f1ad 100644
--- a/skins/ProtestSopa.php
+++ b/skins/ProtestSopa.php
@@ -12,13 +12,13 @@
         * to show the actual HTML output
         */
        public function execute() {
-               $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' );
+               $header = wfMessage( 'blackout-protestsopa-header' )->escaped();
+               $message1 = wfMessage( 'blackout-protestsopa-message1' 
)->escaped();
+               $message2 = wfMessage( 'blackout-protestsopa-message2' 
)->escaped();
+               $message3 = wfMessage( 'blackout-protestsopa-message3' 
)->escaped();
+               $action = wfMessage( 'blackout-protestsopa-action' )->escaped();
+               $actionmsg = wfMessage( 'blackout-protestsopa-actionmsg' 
)->escaped();
+               $join = wfMessage( 'blackout-protestsopa-join' )->escaped();
                ?>
 
        <html>
diff --git a/skins/SopaStrike.php b/skins/SopaStrike.php
index 97b7daa..71acf69 100644
--- a/skins/SopaStrike.php
+++ b/skins/SopaStrike.php
@@ -12,28 +12,28 @@
         * to show the actual HTML output
         */
        public function execute() {
-               $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' );
+               $title = wfMessage( 'blackout-sopastrike-title' )->escaped();
+               $ogdesc = wfMessage( 'blackout-sopastrike-ogdesc' )->escaped();
+               $message1 = wfMessage( 'blackout-sopastrike-message1' 
)->escaped();
+               $message2 = wfMessage( 'blackout-sopastrike-message2' 
)->escaped();
+               $message3 = wfMessage( 'blackout-sopastrike-message3' 
)->escaped();
+               $name = wfMessage( 'allmessagesname' )->escaped();
+               $email = wfMessage( 'email' )->escaped();
+               $address = wfMessage( 'blackout-sopastrike-address' 
)->escaped();
+               $zipcode = wfMessage( 'blackout-sopastrike-zipcode' 
)->escaped();
+               $action = wfMessage( 'blackout-sopastrike-action' )->escaped();
+               $actionmsg1 = wfMessage( 'blackout-sopastrike-actionmsg1' 
)->escaped();
+               $actionmsg2 = wfMessage( 'blackout-sopastrike-actionmsg2' 
)->escaped();
+               $join = wfMessage( 'blackout-sopastrike-join' )->escaped();
+               $add = wfMessage( 'blackout-sopastrike-add' )->escaped();
+               $learn = wfMessage( 'blackout-sopastrike-learn' )->escaped();
+               $video = wfMessage( 'blackout-sopastrike-video' )->escaped();
+               $orgpage = wfMessage( 'blackout-sopastrike-orgpage' 
)->escaped();
+               $infographic = wfMessage( 'blackout-sopastrike-infographic' 
)->escaped();
+               $ocsopa = wfMessage( 'blackout-sopastrike-ocsopa' )->escaped();
+               $ocpipa = wfMessage( 'blackout-sopastrike-ocpipa' )->escaped();
+               $disclaimer = wfMessage( 'blackout-sopastrike-disclaimer' 
)->escaped();
+               $privacy = wfMessage( 'blackout-sopastrike-privacy' 
)->escaped();
                ?>
 
        <!DOCTYPE html>
diff --git a/skins/StopSopa.php b/skins/StopSopa.php
index adefc1e..8983d40 100644
--- a/skins/StopSopa.php
+++ b/skins/StopSopa.php
@@ -12,8 +12,8 @@
         * to show the actual HTML output
         */
        public function execute() {
-               $header = wfMsgHtml( 'blackout-stopsopa-header' );
-               $message = wfMsgHtml( 'blackout-stopsopa-message' );            
+               $header = wfMessage( 'blackout-stopsopa-header' )->escaped();
+               $message = wfMessage( 'blackout-stopsopa-message' )->escaped(); 
        
                ?>
 
        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5eba6cbeeedc4900042c0a85fd9f94353ca4ec5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Blackout
Gerrit-Branch: master
Gerrit-Owner: Georggi199 <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to