[MediaWiki-commits] [Gerrit] Updating function calls for using messages. - change (mediawiki...CloseWikis)

2013-07-08 Thread Hydriz (Code Review)
Hydriz has submitted this change and it was merged.

Change subject: Updating function calls for using messages.
..


Updating function calls for using messages.

The extension has been using outdated message function calls such
as wfMsg, which was already long marked as deprecated by MediaWiki.
This commit seeks to address this and update them to the new
wfMessage function.

Change-Id: I604e94a02b21693943eb6540bb5ceb7c486f7601
---
M SpecialCloseWiki.php
M SpecialListClosedWikis.php
2 files changed, 11 insertions(+), 11 deletions(-)

Approvals:
  Hydriz: Verified; Looks good to me, approved



diff --git a/SpecialCloseWiki.php b/SpecialCloseWiki.php
index ca17995..3d79b25 100644
--- a/SpecialCloseWiki.php
+++ b/SpecialCloseWiki.php
@@ -28,7 +28,7 @@
}
 
public function getDescription() {
-   return wfMsg( 'closewikis-page' );
+   return wfMessage( 'closewikis-page' )->text();
}
 
public function execute( $par ) {
@@ -67,20 +67,20 @@
$dreason = $wgRequest->getVal( 'wpcDisplayReason' );
$lreason = $wgRequest->getVal( 'wpcReason' );
if( !in_array( $wiki, $wgLocalDatabases ) ) {
-   $status = wfMsgExt( 
'closewikis-page-err-nowiki', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-err-nowiki' )->parse();
} else {
$statusOK = CloseWikis::close( $wiki, $dreason, 
$wgUser );
if( $statusOK ) {
-   $status = wfMsgExt( 
'closewikis-page-close-success', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-close-success' )->parse();
$logpage = new LogPage( 'closewiki' );
$logpage->addEntry( 'close', 
$this->getTitle() /* dummy */, $lreason, array( $wiki ) );
} else {
-   $status = wfMsgExt( 
'closewikis-page-err-closed', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-err-closed' )->parse();
}
}
}
 
-   $legend = wfMsgHtml( 'closewikis-page-close' );
+   $legend = wfMessage( 'closewikis-page-close' )->escaped();
 
// If operation was successful, empty all fields
$defaultWiki = $statusOK ? '' : $wgRequest->getVal( 'wpcWiki' );
@@ -116,20 +116,20 @@
$wiki = $wgRequest->getVal( 'wprWiki' );
$lreason = $wgRequest->getVal( 'wprReason' );
if( !in_array( $wiki, $wgLocalDatabases ) ) {
-   $status = wfMsgExt( 
'closewikis-page-err-nowiki', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-err-nowiki' )->parse();
} else {
$statusOK = CloseWikis::reopen( $wiki );
if( $statusOK ) {
-   $status = wfMsgExt( 
'closewikis-page-reopen-success', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-reopen-success' )->parse();
$logpage = new LogPage( 'closewiki' );
$logpage->addEntry( 'reopen', 
$this->getTitle() /* dummy */, $lreason, array( $wiki ) );
} else {
-   $status = wfMsgExt( 
'closewikis-page-err-opened', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-err-opened' )->parse();
}
}
}
 
-   $legend = wfMsgHtml( 'closewikis-page-reopen' );
+   $legend = wfMessage( 'closewikis-page-reopen' )->escaped();
 
// If operation was successful, empty all fields
$defaultWiki = $statusOK ? '' : $wgRequest->getVal( 'wprWiki' );
diff --git a/SpecialListClosedWikis.php b/SpecialListClosedWikis.php
index d9bc7e2..e27364a 100644
--- a/SpecialListClosedWikis.php
+++ b/SpecialListClosedWikis.php
@@ -27,7 +27,7 @@
}
 
public function getDescription() {
-   return wfMsg( 'closewikis-list' );
+   return wfMessage( 'closewikis-list' )->text();
}
 
public function execute( $par ) {
@@ -37,7 +37,7 @@
$wgOut->addWikiMsg( 'closewikis-list-intro' );
$wgOut->addHTML( '' );
foreach( array( 'wiki', 'by', 'timestamp', 'dispreason' ) as 
$column )
-   $wgOut->addHTML( '' . wfMsgExt( 

[MediaWiki-commits] [Gerrit] Updating function calls for using messages. - change (mediawiki...CloseWikis)

2013-07-08 Thread Hydriz (Code Review)
Hydriz has uploaded a new change for review.

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


Change subject: Updating function calls for using messages.
..

Updating function calls for using messages.

The extension has been using outdated message function calls such
as wfMsg, which was already long marked as deprecated by MediaWiki.
This commit seeks to address this and update them to the new
wfMessage function.

Change-Id: I604e94a02b21693943eb6540bb5ceb7c486f7601
---
M SpecialCloseWiki.php
M SpecialListClosedWikis.php
2 files changed, 11 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CloseWikis 
refs/changes/02/72502/1

diff --git a/SpecialCloseWiki.php b/SpecialCloseWiki.php
index ca17995..3d79b25 100644
--- a/SpecialCloseWiki.php
+++ b/SpecialCloseWiki.php
@@ -28,7 +28,7 @@
}
 
public function getDescription() {
-   return wfMsg( 'closewikis-page' );
+   return wfMessage( 'closewikis-page' )->text();
}
 
public function execute( $par ) {
@@ -67,20 +67,20 @@
$dreason = $wgRequest->getVal( 'wpcDisplayReason' );
$lreason = $wgRequest->getVal( 'wpcReason' );
if( !in_array( $wiki, $wgLocalDatabases ) ) {
-   $status = wfMsgExt( 
'closewikis-page-err-nowiki', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-err-nowiki' )->parse();
} else {
$statusOK = CloseWikis::close( $wiki, $dreason, 
$wgUser );
if( $statusOK ) {
-   $status = wfMsgExt( 
'closewikis-page-close-success', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-close-success' )->parse();
$logpage = new LogPage( 'closewiki' );
$logpage->addEntry( 'close', 
$this->getTitle() /* dummy */, $lreason, array( $wiki ) );
} else {
-   $status = wfMsgExt( 
'closewikis-page-err-closed', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-err-closed' )->parse();
}
}
}
 
-   $legend = wfMsgHtml( 'closewikis-page-close' );
+   $legend = wfMessage( 'closewikis-page-close' )->escaped();
 
// If operation was successful, empty all fields
$defaultWiki = $statusOK ? '' : $wgRequest->getVal( 'wpcWiki' );
@@ -116,20 +116,20 @@
$wiki = $wgRequest->getVal( 'wprWiki' );
$lreason = $wgRequest->getVal( 'wprReason' );
if( !in_array( $wiki, $wgLocalDatabases ) ) {
-   $status = wfMsgExt( 
'closewikis-page-err-nowiki', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-err-nowiki' )->parse();
} else {
$statusOK = CloseWikis::reopen( $wiki );
if( $statusOK ) {
-   $status = wfMsgExt( 
'closewikis-page-reopen-success', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-reopen-success' )->parse();
$logpage = new LogPage( 'closewiki' );
$logpage->addEntry( 'reopen', 
$this->getTitle() /* dummy */, $lreason, array( $wiki ) );
} else {
-   $status = wfMsgExt( 
'closewikis-page-err-opened', 'parseinline' );
+   $status = wfMessage( 
'closewikis-page-err-opened' )->parse();
}
}
}
 
-   $legend = wfMsgHtml( 'closewikis-page-reopen' );
+   $legend = wfMessage( 'closewikis-page-reopen' )->escaped();
 
// If operation was successful, empty all fields
$defaultWiki = $statusOK ? '' : $wgRequest->getVal( 'wprWiki' );
diff --git a/SpecialListClosedWikis.php b/SpecialListClosedWikis.php
index d9bc7e2..e27364a 100644
--- a/SpecialListClosedWikis.php
+++ b/SpecialListClosedWikis.php
@@ -27,7 +27,7 @@
}
 
public function getDescription() {
-   return wfMsg( 'closewikis-list' );
+   return wfMessage( 'closewikis-list' )->text();
}
 
public function execute( $par ) {
@@ -37,7 +37,7 @@
$wgOut->addWikiMsg( 'closewikis-list-intro' );
$wgOut->addHTML( '' );
foreach( array( 'wiki', 'by', 'timestamp', 'dispreaso