[MediaWiki-commits] [Gerrit] Replace deprecated function wfMsg() - change (mediawiki...Farmer)

2014-12-08 Thread Paladox (Code Review) 
Paladox has submitted this change and it was merged.

Change subject: Replace deprecated function wfMsg()
..


Replace deprecated function wfMsg()

 - Replaces wfMsg() function calls with
 their non-deprecated equivalents

Bug: T70750
Change-Id: I7f59128f3709a3befbf9d98fe75e4843736c2b1f
(cherry picked from commit 691b4c3a79cf7277ad1eedb6c24d7ebe076e968c)
---
M MediaWikiFarmer.php
M MediaWikiFarmer_Wiki.php
M SpecialFarmer.php
3 files changed, 16 insertions(+), 16 deletions(-)

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



diff --git a/MediaWikiFarmer.php b/MediaWikiFarmer.php
index bae873d..ed06a04 100644
--- a/MediaWikiFarmer.php
+++ b/MediaWikiFarmer.php
@@ -472,7 +472,7 @@
$content = serialize( $this->_extensions );
 
if ( file_put_contents( $file, $content, LOCK_EX ) != strlen( 
$content ) ) {
-   throw new MWException( wfMsgHtml( 
'farmer-error-noextwrite' ) . wfMsgHtml( 'word-separator' ) . $file );
+   throw new MWException( wfMessage( 
'farmer-error-noextwrite' )->escaped() . wfMessage( 'word-separator' 
)->escaped() . $file );
}
}
 
diff --git a/MediaWikiFarmer_Wiki.php b/MediaWikiFarmer_Wiki.php
index 33f355b..ace5532 100644
--- a/MediaWikiFarmer_Wiki.php
+++ b/MediaWikiFarmer_Wiki.php
@@ -142,7 +142,7 @@
$this->createDatabase();
$farmer->updateFarmList();
} else {
-   throw new MWException( wfMsgHtml( 
'farmer-error-exists', $this->_name ) );
+   throw new MWException( wfMessage( 
'farmer-error-exists')->rawParams( $this->_name )->escaped() );
}
}
 
@@ -328,7 +328,7 @@
}
$url = $server . $articlePath;
} else {
-   $url = wfMsgForContent( 'farmerinterwikiurl', 
$this->name, '$1' );
+   $url = wfMessage( 'farmerinterwikiurl' )->rawParams( 
$this->name, '$1' )->inContentLanguage()->text();
}
if ( !is_null( $article ) )
$url = str_replace( '$1', $article, $url );
@@ -469,7 +469,7 @@
$newid = $article->insertOn( $db );
$revision = new Revision( array(
'page'=> $newid,
-   'text'=> wfMsgForContent( 'farmernewwikimainpage' ),
+   'text'=> wfMessage( 'farmernewwikimainpage' 
)->inContentLanguage()->text(),
'comment'   => '',
'user'=> 0,
'user_text' => 'MediaWiki default',
diff --git a/SpecialFarmer.php b/SpecialFarmer.php
index b670dec..7a9fe15 100644
--- a/SpecialFarmer.php
+++ b/SpecialFarmer.php
@@ -162,7 +162,7 @@
$nameaccount = htmlspecialchars( $name );
$nametitle = htmlspecialchars( $title );
$namedescript = htmlspecialchars( $description 
);
-   $confirmaccount = wfMsgHtml( 
'farmer-button-confirm' );
+   $confirmaccount = wfMessage( 
'farmer-button-confirm' )->escaped();
$wgOut->addHTML( "
 
 
@@ -296,7 +296,7 @@
$current = $wgFarmer->getActiveWiki()->name;
 
foreach ( $list as $wiki ) {
-   $link = ( $current == $wiki['name'] ? wfMsgForContent( 
'mainpage' ) : $wiki['name'] . ':' );
+   $link = ( $current == $wiki['name'] ? wfMessage( 
'mainpage' )->inContentLanguage()->text() : $wiki['name'] . ':' );
$wgOut->addWikiText( '; [[' . $link . '|' . 
$wiki['title'] . ']] : ' . $wiki['description'] );
}
}
@@ -337,7 +337,7 @@
$wgOut->addHTML(
'' .
'' .
-   '' .
+   '' .
''
);
}
@@ -348,7 +348,7 @@
$wgOut->addHTML(
'' .
'' 
. htmlspecialchars( $wiki->description ) . '' .
-   '' .
+   '' .
''
);
 
@@ -448,7 +448,7 @@
$wgOut->addHTML( $toAdd . "\n" );
}
 
-   $wgOut->addHTML( '' );
+   $wgOut->addHTML( '' );
$wgOut->addHTML( '' );
}
 
@@ -484,7 +484,7 @@
$wgOut->addHTML( $toAdd );
}
 
-   $wgOut->addHTML( '' );
+   $wgOut->addHTML( '' );
$wgOut->addHTML( ''

[MediaWiki-commits] [Gerrit] Replace deprecated function wfMsg() - change (mediawiki...Farmer)

2014-12-08 Thread Paladox (Code Review) 
Paladox has uploaded a new change for review.

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

Change subject: Replace deprecated function wfMsg()
..

Replace deprecated function wfMsg()

 - Replaces wfMsg() function calls with
 their non-deprecated equivalents

Bug: T70750
Change-Id: I7f59128f3709a3befbf9d98fe75e4843736c2b1f
(cherry picked from commit 691b4c3a79cf7277ad1eedb6c24d7ebe076e968c)
---
M MediaWikiFarmer.php
M MediaWikiFarmer_Wiki.php
M SpecialFarmer.php
3 files changed, 16 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Farmer 
refs/changes/51/178451/1

diff --git a/MediaWikiFarmer.php b/MediaWikiFarmer.php
index bae873d..ed06a04 100644
--- a/MediaWikiFarmer.php
+++ b/MediaWikiFarmer.php
@@ -472,7 +472,7 @@
$content = serialize( $this->_extensions );
 
if ( file_put_contents( $file, $content, LOCK_EX ) != strlen( 
$content ) ) {
-   throw new MWException( wfMsgHtml( 
'farmer-error-noextwrite' ) . wfMsgHtml( 'word-separator' ) . $file );
+   throw new MWException( wfMessage( 
'farmer-error-noextwrite' )->escaped() . wfMessage( 'word-separator' 
)->escaped() . $file );
}
}
 
diff --git a/MediaWikiFarmer_Wiki.php b/MediaWikiFarmer_Wiki.php
index 33f355b..ace5532 100644
--- a/MediaWikiFarmer_Wiki.php
+++ b/MediaWikiFarmer_Wiki.php
@@ -142,7 +142,7 @@
$this->createDatabase();
$farmer->updateFarmList();
} else {
-   throw new MWException( wfMsgHtml( 
'farmer-error-exists', $this->_name ) );
+   throw new MWException( wfMessage( 
'farmer-error-exists')->rawParams( $this->_name )->escaped() );
}
}
 
@@ -328,7 +328,7 @@
}
$url = $server . $articlePath;
} else {
-   $url = wfMsgForContent( 'farmerinterwikiurl', 
$this->name, '$1' );
+   $url = wfMessage( 'farmerinterwikiurl' )->rawParams( 
$this->name, '$1' )->inContentLanguage()->text();
}
if ( !is_null( $article ) )
$url = str_replace( '$1', $article, $url );
@@ -469,7 +469,7 @@
$newid = $article->insertOn( $db );
$revision = new Revision( array(
'page'=> $newid,
-   'text'=> wfMsgForContent( 'farmernewwikimainpage' ),
+   'text'=> wfMessage( 'farmernewwikimainpage' 
)->inContentLanguage()->text(),
'comment'   => '',
'user'=> 0,
'user_text' => 'MediaWiki default',
diff --git a/SpecialFarmer.php b/SpecialFarmer.php
index b670dec..7a9fe15 100644
--- a/SpecialFarmer.php
+++ b/SpecialFarmer.php
@@ -162,7 +162,7 @@
$nameaccount = htmlspecialchars( $name );
$nametitle = htmlspecialchars( $title );
$namedescript = htmlspecialchars( $description 
);
-   $confirmaccount = wfMsgHtml( 
'farmer-button-confirm' );
+   $confirmaccount = wfMessage( 
'farmer-button-confirm' )->escaped();
$wgOut->addHTML( "
 
 
@@ -296,7 +296,7 @@
$current = $wgFarmer->getActiveWiki()->name;
 
foreach ( $list as $wiki ) {
-   $link = ( $current == $wiki['name'] ? wfMsgForContent( 
'mainpage' ) : $wiki['name'] . ':' );
+   $link = ( $current == $wiki['name'] ? wfMessage( 
'mainpage' )->inContentLanguage()->text() : $wiki['name'] . ':' );
$wgOut->addWikiText( '; [[' . $link . '|' . 
$wiki['title'] . ']] : ' . $wiki['description'] );
}
}
@@ -337,7 +337,7 @@
$wgOut->addHTML(
'' .
'' .
-   '' .
+   '' .
''
);
}
@@ -348,7 +348,7 @@
$wgOut->addHTML(
'' .
'' 
. htmlspecialchars( $wiki->description ) . '' .
-   '' .
+   '' .
''
);
 
@@ -448,7 +448,7 @@
$wgOut->addHTML( $toAdd . "\n" );
}
 
-   $wgOut->addHTML( '' );
+   $wgOut->addHTML( '' );
$wgOut->addHTML( '' );
}
 
@@ -484,7 +484,7 @@
$wgOut->addHTML( $toAdd );
}
 
-   $wgOut->addHTML( '' );
+

[MediaWiki-commits] [Gerrit] Replace deprecated function wfMsg() - change (mediawiki...Farmer)

2014-12-08 Thread Paladox (Code Review) 
Paladox has submitted this change and it was merged.

Change subject: Replace deprecated function wfMsg()
..


Replace deprecated function wfMsg()

 - Replaces wfMsg() function calls with
 their non-deprecated equivalents

Bug: T70750
Change-Id: I7f59128f3709a3befbf9d98fe75e4843736c2b1f
---
M MediaWikiFarmer.php
M MediaWikiFarmer_Wiki.php
M SpecialFarmer.php
3 files changed, 16 insertions(+), 16 deletions(-)

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



diff --git a/MediaWikiFarmer.php b/MediaWikiFarmer.php
index bae873d..ed06a04 100644
--- a/MediaWikiFarmer.php
+++ b/MediaWikiFarmer.php
@@ -472,7 +472,7 @@
$content = serialize( $this->_extensions );
 
if ( file_put_contents( $file, $content, LOCK_EX ) != strlen( 
$content ) ) {
-   throw new MWException( wfMsgHtml( 
'farmer-error-noextwrite' ) . wfMsgHtml( 'word-separator' ) . $file );
+   throw new MWException( wfMessage( 
'farmer-error-noextwrite' )->escaped() . wfMessage( 'word-separator' 
)->escaped() . $file );
}
}
 
diff --git a/MediaWikiFarmer_Wiki.php b/MediaWikiFarmer_Wiki.php
index 33f355b..ace5532 100644
--- a/MediaWikiFarmer_Wiki.php
+++ b/MediaWikiFarmer_Wiki.php
@@ -142,7 +142,7 @@
$this->createDatabase();
$farmer->updateFarmList();
} else {
-   throw new MWException( wfMsgHtml( 
'farmer-error-exists', $this->_name ) );
+   throw new MWException( wfMessage( 
'farmer-error-exists')->rawParams( $this->_name )->escaped() );
}
}
 
@@ -328,7 +328,7 @@
}
$url = $server . $articlePath;
} else {
-   $url = wfMsgForContent( 'farmerinterwikiurl', 
$this->name, '$1' );
+   $url = wfMessage( 'farmerinterwikiurl' )->rawParams( 
$this->name, '$1' )->inContentLanguage()->text();
}
if ( !is_null( $article ) )
$url = str_replace( '$1', $article, $url );
@@ -469,7 +469,7 @@
$newid = $article->insertOn( $db );
$revision = new Revision( array(
'page'=> $newid,
-   'text'=> wfMsgForContent( 'farmernewwikimainpage' ),
+   'text'=> wfMessage( 'farmernewwikimainpage' 
)->inContentLanguage()->text(),
'comment'   => '',
'user'=> 0,
'user_text' => 'MediaWiki default',
diff --git a/SpecialFarmer.php b/SpecialFarmer.php
index b670dec..7a9fe15 100644
--- a/SpecialFarmer.php
+++ b/SpecialFarmer.php
@@ -162,7 +162,7 @@
$nameaccount = htmlspecialchars( $name );
$nametitle = htmlspecialchars( $title );
$namedescript = htmlspecialchars( $description 
);
-   $confirmaccount = wfMsgHtml( 
'farmer-button-confirm' );
+   $confirmaccount = wfMessage( 
'farmer-button-confirm' )->escaped();
$wgOut->addHTML( "
 
 
@@ -296,7 +296,7 @@
$current = $wgFarmer->getActiveWiki()->name;
 
foreach ( $list as $wiki ) {
-   $link = ( $current == $wiki['name'] ? wfMsgForContent( 
'mainpage' ) : $wiki['name'] . ':' );
+   $link = ( $current == $wiki['name'] ? wfMessage( 
'mainpage' )->inContentLanguage()->text() : $wiki['name'] . ':' );
$wgOut->addWikiText( '; [[' . $link . '|' . 
$wiki['title'] . ']] : ' . $wiki['description'] );
}
}
@@ -337,7 +337,7 @@
$wgOut->addHTML(
'' .
'' .
-   '' .
+   '' .
''
);
}
@@ -348,7 +348,7 @@
$wgOut->addHTML(
'' .
'' 
. htmlspecialchars( $wiki->description ) . '' .
-   '' .
+   '' .
''
);
 
@@ -448,7 +448,7 @@
$wgOut->addHTML( $toAdd . "\n" );
}
 
-   $wgOut->addHTML( '' );
+   $wgOut->addHTML( '' );
$wgOut->addHTML( '' );
}
 
@@ -484,7 +484,7 @@
$wgOut->addHTML( $toAdd );
}
 
-   $wgOut->addHTML( '' );
+   $wgOut->addHTML( '' );
$wgOut->addHTML( '' );
}
}
@@ -549,20 +549,20 @@

[MediaWiki-commits] [Gerrit] Replace deprecated function wfMsg() - change (mediawiki...Farmer)

2014-12-08 Thread Sn1per (Code Review) 
Sn1per has uploaded a new change for review.

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

Change subject: Replace deprecated function wfMsg()
..

Replace deprecated function wfMsg()

 - Replaces wfMsg() function calls with
 their non-deprecated equivalents

Bug: 68750
Change-Id: I7f59128f3709a3befbf9d98fe75e4843736c2b1f
---
M MediaWikiFarmer.php
M MediaWikiFarmer_Wiki.php
M SpecialFarmer.php
3 files changed, 16 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Farmer 
refs/changes/28/178428/1

diff --git a/MediaWikiFarmer.php b/MediaWikiFarmer.php
index bae873d..ed06a04 100644
--- a/MediaWikiFarmer.php
+++ b/MediaWikiFarmer.php
@@ -472,7 +472,7 @@
$content = serialize( $this->_extensions );
 
if ( file_put_contents( $file, $content, LOCK_EX ) != strlen( 
$content ) ) {
-   throw new MWException( wfMsgHtml( 
'farmer-error-noextwrite' ) . wfMsgHtml( 'word-separator' ) . $file );
+   throw new MWException( wfMessage( 
'farmer-error-noextwrite' )->escaped() . wfMessage( 'word-separator' 
)->escaped() . $file );
}
}
 
diff --git a/MediaWikiFarmer_Wiki.php b/MediaWikiFarmer_Wiki.php
index 33f355b..ace5532 100644
--- a/MediaWikiFarmer_Wiki.php
+++ b/MediaWikiFarmer_Wiki.php
@@ -142,7 +142,7 @@
$this->createDatabase();
$farmer->updateFarmList();
} else {
-   throw new MWException( wfMsgHtml( 
'farmer-error-exists', $this->_name ) );
+   throw new MWException( wfMessage( 
'farmer-error-exists')->rawParams( $this->_name )->escaped() );
}
}
 
@@ -328,7 +328,7 @@
}
$url = $server . $articlePath;
} else {
-   $url = wfMsgForContent( 'farmerinterwikiurl', 
$this->name, '$1' );
+   $url = wfMessage( 'farmerinterwikiurl' )->rawParams( 
$this->name, '$1' )->inContentLanguage()->text();
}
if ( !is_null( $article ) )
$url = str_replace( '$1', $article, $url );
@@ -469,7 +469,7 @@
$newid = $article->insertOn( $db );
$revision = new Revision( array(
'page'=> $newid,
-   'text'=> wfMsgForContent( 'farmernewwikimainpage' ),
+   'text'=> wfMessage( 'farmernewwikimainpage' 
)->inContentLanguage()->text(),
'comment'   => '',
'user'=> 0,
'user_text' => 'MediaWiki default',
diff --git a/SpecialFarmer.php b/SpecialFarmer.php
index b670dec..7a9fe15 100644
--- a/SpecialFarmer.php
+++ b/SpecialFarmer.php
@@ -162,7 +162,7 @@
$nameaccount = htmlspecialchars( $name );
$nametitle = htmlspecialchars( $title );
$namedescript = htmlspecialchars( $description 
);
-   $confirmaccount = wfMsgHtml( 
'farmer-button-confirm' );
+   $confirmaccount = wfMessage( 
'farmer-button-confirm' )->escaped();
$wgOut->addHTML( "
 
 
@@ -296,7 +296,7 @@
$current = $wgFarmer->getActiveWiki()->name;
 
foreach ( $list as $wiki ) {
-   $link = ( $current == $wiki['name'] ? wfMsgForContent( 
'mainpage' ) : $wiki['name'] . ':' );
+   $link = ( $current == $wiki['name'] ? wfMessage( 
'mainpage' )->inContentLanguage()->text() : $wiki['name'] . ':' );
$wgOut->addWikiText( '; [[' . $link . '|' . 
$wiki['title'] . ']] : ' . $wiki['description'] );
}
}
@@ -337,7 +337,7 @@
$wgOut->addHTML(
'' .
'' .
-   '' .
+   '' .
''
);
}
@@ -348,7 +348,7 @@
$wgOut->addHTML(
'' .
'' 
. htmlspecialchars( $wiki->description ) . '' .
-   '' .
+   '' .
''
);
 
@@ -448,7 +448,7 @@
$wgOut->addHTML( $toAdd . "\n" );
}
 
-   $wgOut->addHTML( '' );
+   $wgOut->addHTML( '' );
$wgOut->addHTML( '' );
}
 
@@ -484,7 +484,7 @@
$wgOut->addHTML( $toAdd );
}
 
-   $wgOut->addHTML( '' );
+   $wgOut->addHTML( '' );
$wgOut->addHTML( ''