dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Handle missing namespace prefix in XML dumps more gracefully"
[lhc/web/wiklou.git]
/
includes
/
export
/
XmlDumpWriter.php
diff --git
a/includes/export/XmlDumpWriter.php
b/includes/export/XmlDumpWriter.php
index
ab26803
..
5a1f92c
100644
(file)
--- a/
includes/export/XmlDumpWriter.php
+++ b/
includes/export/XmlDumpWriter.php
@@
-38,7
+38,7
@@
class XmlDumpWriter {
* @return string
*/
function openStream() {
* @return string
*/
function openStream() {
- global $wg
LanguageCode
;
+ global $wg
ContLang
;
$ver = WikiExporter::schemaVersion();
return Xml::element( 'mediawiki', [
'xmlns' => "http://www.mediawiki.org/xml/export-$ver/",
$ver = WikiExporter::schemaVersion();
return Xml::element( 'mediawiki', [
'xmlns' => "http://www.mediawiki.org/xml/export-$ver/",
@@
-56,7
+56,7
@@
class XmlDumpWriter {
'xsi:schemaLocation' => "http://www.mediawiki.org/xml/export-$ver/ " .
"http://www.mediawiki.org/xml/export-$ver.xsd",
'version' => $ver,
'xsi:schemaLocation' => "http://www.mediawiki.org/xml/export-$ver/ " .
"http://www.mediawiki.org/xml/export-$ver.xsd",
'version' => $ver,
- 'xml:lang' => $wg
LanguageCode
],
+ 'xml:lang' => $wg
ContLang->getHtmlCode()
],
null ) .
"\n" .
$this->siteInfo();
null ) .
"\n" .
$this->siteInfo();
@@
-269,7
+269,9
@@
class XmlDumpWriter {
$out .= " <sha1/>\n";
}
$out .= " <sha1/>\n";
}
- Hooks::run( 'XmlDumpWriterWriteRevision', [ &$this, &$out, $row, $text ] );
+ // Avoid PHP 7.1 warning from passing $this by reference
+ $writer = $this;
+ Hooks::run( 'XmlDumpWriterWriteRevision', [ &$writer, &$out, $row, $text ] );
$out .= " </revision>\n";
$out .= " </revision>\n";
@@
-431,6
+433,9
@@
class XmlDumpWriter {
global $wgContLang;
$prefix = $wgContLang->getFormattedNsText( $title->getNamespace() );
global $wgContLang;
$prefix = $wgContLang->getFormattedNsText( $title->getNamespace() );
+ // @todo Emit some kind of warning to the user if $title->getNamespace() !==
+ // NS_MAIN and $prefix === '' (viz. pages in an unregistered namespace)
+
if ( $prefix !== '' ) {
$prefix .= ':';
}
if ( $prefix !== '' ) {
$prefix .= ':';
}