Merge "Use type Language instead of string for $lang of doEditSectionLink"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 731f874..6e82321 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -165,6 +165,7 @@ because of Phabricator reports.
   use 'EditPageGetCheckboxesDefinition' instead.
 * Linker::getLinkColour() and DummyLinker::getLinkColour(), deprecated since
   1.28, were removed. LinkRenderer::getLinkClasses() should be used instead.
+* Skin::doEditSectionLink requires type Language for optional parameter $lang.
 
 === Deprecations in 1.32 ===
 * Use of a StartProfiler.php file is deprecated in favour of placing

diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index 265d151..ed1dd19 100644 (file)
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -314,7 +314,7 @@ class ParserOutput extends CacheTime {
                                        return $skin->doEditSectionLink( $editsectionPage,
                                                $editsectionSection,
                                                $editsectionContent,
-                                               $wgLang->getCode()
+                                               $wgLang
                                        );
                                },
                                $text

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 8384ca0..60b7022 100644 (file)
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -1612,14 +1612,15 @@ abstract class Skin extends ContextSource {
         *   to be included in the link, like "&section=$section"
         * @param string $tooltip The tooltip to use for the link: will be escaped
         *   and wrapped in the 'editsectionhint' message
-        * @param string $lang Language code
+        * @param Language|null $lang Language object, defaults to user interface language
         * @return string HTML to use for edit link
         */
-       public function doEditSectionLink( Title $nt, $section, $tooltip = null, $lang = false ) {
+       public function doEditSectionLink( Title $nt, $section, $tooltip = null, Language $lang = null ) {
                // HTML generated here should probably have userlangattributes
                // added to it for LTR text on RTL pages
 
-               $lang = wfGetLangObj( $lang );
+               global $wgLang;
+               $lang = $lang ?: $wgLang;
 
                $attribs = [];
                if ( !is_null( $tooltip ) ) {