From 85a70f60e1b8bb3a1a840d2a6e8f456ac14eddd0 Mon Sep 17 00:00:00 2001 From: Daniel Friesen Date: Mon, 12 Dec 2011 20:09:06 +0000 Subject: [PATCH] Followup r105812: - Fix case of the wfBCP47 call - Don't call wfBCP47 for every time getHtmlCode is called - Add @since --- languages/Language.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/languages/Language.php b/languages/Language.php index a712246d22..fe4f8a4ba2 100644 --- a/languages/Language.php +++ b/languages/Language.php @@ -61,6 +61,7 @@ class Language { var $mVariants, $mCode, $mLoaded = false; var $mMagicExtensions = array(), $mMagicHookDone = false; + private $mHtmlCode = null; var $mNamespaceIds, $namespaceNames, $namespaceAliases; var $dateFormatStrings = array(); @@ -3467,9 +3468,13 @@ class Language { /** * Get the code in Bcp47 format which we can use * inside of html lang="" tags. + * @since 1.19 */ function getHtmlCode() { - return wfBcp47( $this->getCode() ); + if ( is_null( $this->mHtmlCode ) ) { + $this->mHtmlCode = wfBCP47( $this->getCode() ); + } + return $this->mHtmlCode; } /** @@ -3477,6 +3482,8 @@ class Language { */ function setCode( $code ) { $this->mCode = $code; + // Ensure we don't leave an incorrect html code lying around + unset( $this->mHtmlCode ); } /** -- 2.20.1