summaryrefslogtreecommitdiff
path: root/includes/Export.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-12-20 09:00:55 +0100
committerPierre Schmitz <pierre@archlinux.de>2015-12-20 09:00:55 +0100
commita2190ac74dd4d7080b12bab90e552d7aa81209ef (patch)
tree8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/Export.php
parent15e69f7b20b6596b9148030acce5b59993b95a45 (diff)
parent257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff)
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/Export.php')
-rw-r--r--includes/Export.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/Export.php b/includes/Export.php
index 4600feb5..adab21c3 100644
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -874,7 +874,7 @@ class XmlDumpWriter {
}
global $wgContLang;
- $prefix = str_replace( '_', ' ', $wgContLang->getNsText( $title->getNamespace() ) );
+ $prefix = $wgContLang->getFormattedNsText( $title->getNamespace() );
if ( $prefix !== '' ) {
$prefix .= ':';
@@ -1191,7 +1191,7 @@ class Dump7ZipOutput extends DumpPipeOutput {
* @return string
*/
function setup7zCommand( $file ) {
- $command = "7za a -bd -si " . wfEscapeShellArg( $file );
+ $command = "7za a -bd -si -mx=4 " . wfEscapeShellArg( $file );
// Suppress annoying useless crap from p7zip
// Unfortunately this could suppress real error messages too
$command .= ' >' . wfGetNull() . ' 2>&1';