* @param string $message
* @param array $args
* @return string
- * @deprecated since 1.25 Use the RawMessage class
* @private
*/
function wfMsgReplaceArgs( $message, $args ) {
}
if ( isset( self::$messageMap[$key] ) ) {
- $codeMsg = new RawMessage( self::$messageMap[$key]['code'] );
- $infoMsg = new RawMessage( self::$messageMap[$key]['info'] );
return array(
- 'code' => $codeMsg->params( $error )->text(),
- 'info' => $infoMsg->params( $error )->text()
+ 'code' => wfMsgReplaceArgs( self::$messageMap[$key]['code'], $error ),
+ 'info' => wfMsgReplaceArgs( self::$messageMap[$key]['info'], $error )
);
}
$msg .= "\n$astriks Permissions $astriks\n\n";
foreach ( self::$mRights as $right => $rightMsg ) {
$groups = User::getGroupsWithPermission( $right );
- $rightRawMsg = new RawMessage( $rightMsg['msg'] );
- $msg .= "* " . $right . " *\n " . $rightRawMsg->params( $rightMsg['params'] )->text() .
+ $msg .= "* " . $right . " *\n " . wfMsgReplaceArgs( $rightMsg['msg'], $rightMsg['params'] ) .
"\nGranted to:\n " . str_replace( '*', 'all', implode( ', ', $groups ) ) . "\n\n";
}
$args = array_slice( func_get_args(), 2 );
if ( $this->useMessageCache() ) {
- $msg = wfMessage( $key )->useDatabase( false );
+ return wfMessage( $key, $args )->useDatabase( false )->text();
} else {
- $msg = new RawMessage( $fallback );
+ return wfMsgReplaceArgs( $fallback, $args );
}
-
- return $msg->params( $args )->text();
}
/**
$args = array_slice( func_get_args(), 2 );
if ( $this->useMessageCache() ) {
- $msg = wfMessage( $key );
+ return wfMessage( $key, $args )->text();
} else {
- $msg = new RawMessage( $fallback );
+ return wfMsgReplaceArgs( $fallback, $args );
}
-
- return $msg->params( $args )->text();
}
/**
$wgContLang->timeanddate( wfTimestamp( TS_MW, $s->rev_timestamp ) ),
$current->getId(), $wgContLang->timeanddate( $current->getTimestamp() )
);
- if ( !$summary instanceof Message ) {
- $summary = new RawMessage( $summary );
+ if ( $summary instanceof Message ) {
+ $summary = $summary->params( $args )->inContentLanguage()->text();
+ } else {
+ $summary = wfMsgReplaceArgs( $summary, $args );
}
- $summary = $summary->params( $args )->inContentLanguage()->text();
// Trim spaces on user supplied text
$summary = trim( $summary );