Merge "Export: Use BCP 47 language code for attribute xml:lang"

diff --combined includes/export/XmlDumpWriter.php
index ab26803,5cea50c..5be166b
--- 1/includes/export/XmlDumpWriter.php
--- 2/includes/export/XmlDumpWriter.php
+++ b/includes/export/XmlDumpWriter.php
@@@ -38,7 -38,7 +38,7 @@@ class XmlDumpWriter 
         * @return string
         */
        function openStream() {
-               global $wgLanguageCode;
+               global $wgContLang;
                $ver = WikiExporter::schemaVersion();
                return Xml::element( 'mediawiki', [
                        'xmlns'              => "http://www.mediawiki.org/xml/export-$ver/",
@@@ -51,12 -51,12 +51,12 @@@
                         * you copy in the new xsd file.
                         *
                         * After it is reviewed, merged and deployed (sync-docroot), the index.html needs purging.
 -                       * echo "http://www.mediawiki.org/xml/index.html" | mwscript purgeList.php --wiki=aawiki
 +                       * echo "https://www.mediawiki.org/xml/index.html" | mwscript purgeList.php --wiki=aawiki
                         */
                        'xsi:schemaLocation' => "http://www.mediawiki.org/xml/export-$ver/ " .
                                "http://www.mediawiki.org/xml/export-$ver.xsd",
                        'version'            => $ver,
-                       'xml:lang'           => $wgLanguageCode ],
+                       'xml:lang'           => $wgContLang->getHtmlCode() ],
                        null ) .
                        "\n" .
                        $this->siteInfo();
@@@ -405,7 -405,7 +405,7 @@@
                        "      " . $comment . "\n" .
                        "      " . Xml::element( 'filename', null, $file->getName() ) . "\n" .
                        $archiveName .
 -                      "      " . Xml::element( 'src', null, $file->getCanonicalURL() ) . "\n" .
 +                      "      " . Xml::element( 'src', null, $file->getCanonicalUrl() ) . "\n" .
                        "      " . Xml::element( 'size', null, $file->getSize() ) . "\n" .
                        "      " . Xml::element( 'sha1base36', null, $file->getSha1() ) . "\n" .
                        "      " . Xml::element( 'rel', null, $file->getRel() ) . "\n" .