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

Merge "Allow and use type Language instead of string for $lang of doEditSectionLink"

Browse source
This commit is contained in:
jenkins-bot 2018-10-11 19:52:13 +00:00 committed by Gerrit Code Review
commit 9da7211bc8
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
RELEASE-NOTES-1.32
View file

@ -522,6 +522,9 @@ because of Phabricator reports.
as a string. They should be given as a OOUI\FieldLayout object instead.
Notably, this affects fields defined in the 'GetPreferences' hook, because
Special:Preferences uses an OOUI form now. (If possible, don't use 'rawrow'.)
* In Skin::doEditSectionLink omitting the parameters $tooltip and $lang is
deprecated. For the $lang parameter, types other than Language are
deprecated.
=== Other changes in 1.32 ===
* (T198811) The following tables have had their UNIQUE indexes turned into

2
includes/parser/ParserOutput.php
View file

@ -338,7 +338,7 @@ class ParserOutput extends CacheTime {
return $skin->doEditSectionLink( $editsectionPage,
$editsectionSection,
$editsectionContent,
$wgLang->getCode()
$wgLang
);
},
$text

11
includes/skins/Skin.php
View file

@ -1610,15 +1610,20 @@ abstract class Skin extends ContextSource {
* @param string $section The designation of the section being pointed to,
* to be included in the link, like "&section=$section"
* @param string|null $tooltip The tooltip to use for the link: will be escaped
* and wrapped in the 'editsectionhint' message
* @param string $lang Language code
* and wrapped in the 'editsectionhint' message.
* Not setting this parameter is deprecated.
* @param Language|string $lang Language object or language code string.
* Type string is deprecated. Not setting this parameter is deprecated.
* @return string HTML to use for edit link
*/
public function doEditSectionLink( Title $nt, $section, $tooltip = null, $lang = false ) {
// HTML generated here should probably have userlangattributes
// added to it for LTR text on RTL pages
$lang = wfGetLangObj( $lang );
if ( !$lang instanceof Language ) {
wfDeprecated( __METHOD__ . ' with other type than Language for $lang', '1.32' );
$lang = wfGetLangObj( $lang );
}
$attribs = [];
if ( !is_null( $tooltip ) ) {