}
}
- /**\r
- * Return the list of ipblocks fields that should be selected to create\r
- * a new block.\r
- * @return array\r
- */\r
- public static function selectFields() {\r
- return array(\r
+ /**
+ * Return the list of ipblocks fields that should be selected to create
+ * a new block.
+ * @return array
+ */
+ public static function selectFields() {
+ return array(
'ipb_id',
'ipb_address',
'ipb_by',
'ipb_deleted',
'ipb_block_email',
'ipb_allow_usertalk',
- 'ipb_parent_block_id',\r
- );\r
+ 'ipb_parent_block_id',
+ );
}
/**
$key = wfMemcKey( 'ipb', 'autoblock', 'whitelist' );
$lines = $wgMemc->get( $key );
if ( !$lines ) {
- $lines = explode( "\n", wfMsgForContentNoTrans( 'autoblock_whitelist' ) );
+ $lines = explode( "\n", wfMessage( 'autoblock_whitelist' )->inContentLanguage()->plain() );
$wgMemc->set( $key, $lines, 3600 * 24 );
}
wfDebug( "Autoblocking {$this->getTarget()}@" . $autoblockIP . "\n" );
$autoblock->setTarget( $autoblockIP );
$autoblock->setBlocker( $this->getBlocker() );
- $autoblock->mReason = wfMsgForContent( 'autoblocker', $this->getTarget(), $this->mReason );
+ $autoblock->mReason = wfMessage( 'autoblocker', $this->getTarget(), $this->mReason )->inContentLanguage()->text();
$timestamp = wfTimestampNow();
$autoblock->mTimestamp = $timestamp;
$autoblock->mAuto = 1;
$keys = array( 'infiniteblock', 'expiringblock' );
foreach ( $keys as $key ) {
- $msg[$key] = wfMsgHtml( $key );
+ $msg[$key] = wfMessage( $key )->escaped();
}
}