Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop support for 'options' in OutputPage::wrapWikiMsg()

Browse source 
It was not used[1] and complicated migration to Message class.

[1] Checked uses in 100 extensions, including most Wikimedia, twn and SMW extensions.

Change-Id: Id2ac68ef79e98272d02117165e2f04034f209fb3
This commit is contained in:
Siebrand Mazeland 2012-09-03 12:18:23 +02:00 committed by Antoine Musso
parent 92d1f06eeb
commit a6e8b13531
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES-1.20
View file

@ -306,6 +306,8 @@ changes to languages because of Bugzilla reports.
* Deprecated DatabaseBase functions newFromParams(), newFromType(), set(), * Deprecated DatabaseBase functions newFromParams(), newFromType(), set(),
quote_ident(), and escapeLike() were removed. quote_ident(), and escapeLike() were removed.
* Use of __DIR__ instead of dirname( __FILE__ ). * Use of __DIR__ instead of dirname( __FILE__ ).
* OutputPage::wrapWikiMsg() no longer supports the 'options' parameter. It was
not used and complicated migration to Message class.
== Compatibility == == Compatibility ==

9
includes/OutputPage.php
View file

@ -3537,9 +3537,6 @@ $templates
* message names, or arrays, in which case the first element is the message name, * message names, or arrays, in which case the first element is the message name,
* and subsequent elements are the parameters to that message. * and subsequent elements are the parameters to that message.
* *
* The special named parameter 'options' in a message specification array is passed
* through to the $options parameter of wfMsgExt().
*
* Don't use this for messages that are not in users interface language. * Don't use this for messages that are not in users interface language.
* *
* For example: * For example:
@ -3567,12 +3564,16 @@ $templates
if ( isset( $args['options'] ) ) { if ( isset( $args['options'] ) ) {
$options = $args['options']; $options = $args['options'];
unset( $args['options'] ); unset( $args['options'] );
wfDeprecated(
'Adding "options" to ' . __METHOD__ . ' is no longer supported',
'1.20'
);
} }
} else { } else {
$args = array(); $args = array();
$name = $spec; $name = $spec;
} }
$s = str_replace( '$' . ( $n + 1 ), wfMsgExt( $name, $options, $args ), $s ); $s = str_replace( '$' . ( $n + 1 ), wfMessage( $name, $args )->plain(), $s );
} }
$this->addWikiText( $s ); $this->addWikiText( $s );
} }