* (bug 12506) Allow URL parameter 'section' in Special:Mypage/Mytalk. Patch by Eneas.

[lhc/web/wiklou.git] / includes / Export.php

diff --git a/includes/Export.php b/includes/Export.php
index 1582d0d..69d88fc 100644 (file)
--- a/includes/Export.php
+++ b/includes/Export.php
@@ -111,7 +111,7 @@ class WikiExporter {
        function pageByTitle( $title ) {
                return $this->dumpFrom(
                        'page_namespace=' . $title->getNamespace() .
-                       ' AND page_title=' . $this->db->addQuotes( $title->getDbKey() ) );
+                       ' AND page_title=' . $this->db->addQuotes( $title->getDBkey() ) );
        }
 
        function pageByName( $name ) {
@@ -281,6 +281,9 @@ class WikiExporter {
        }
 }
 
+/**
+ * @addtogroup Dump
+ */
 class XmlDumpWriter {
 
        /**
@@ -463,6 +466,7 @@ class XmlDumpWriter {
 
 /**
  * Base class for output stream; prints to stdout or buffer or whereever.
+ * @addtogroup Dump
  */
 class DumpOutput {
        function writeOpenStream( $string ) {
@@ -496,6 +500,7 @@ class DumpOutput {
 
 /**
  * Stream outputter to send data to a file.
+ * @addtogroup Dump
  */
 class DumpFileOutput extends DumpOutput {
        var $handle;
@@ -513,6 +518,7 @@ class DumpFileOutput extends DumpOutput {
  * Stream outputter to send data to a file via some filter program.
  * Even if compression is available in a library, using a separate
  * program can allow us to make use of a multi-processor system.
+ * @addtogroup Dump
  */
 class DumpPipeOutput extends DumpFileOutput {
        function DumpPipeOutput( $command, $file = null ) {
@@ -525,6 +531,7 @@ class DumpPipeOutput extends DumpFileOutput {
 
 /**
  * Sends dump output via the gzip compressor.
+ * @addtogroup Dump
  */
 class DumpGZipOutput extends DumpPipeOutput {
        function DumpGZipOutput( $file ) {
@@ -534,6 +541,7 @@ class DumpGZipOutput extends DumpPipeOutput {
 
 /**
  * Sends dump output via the bgzip2 compressor.
+ * @addtogroup Dump
  */
 class DumpBZip2Output extends DumpPipeOutput {
        function DumpBZip2Output( $file ) {
@@ -543,13 +551,14 @@ class DumpBZip2Output extends DumpPipeOutput {
 
 /**
  * Sends dump output via the p7zip compressor.
+ * @addtogroup Dump
  */
 class Dump7ZipOutput extends DumpPipeOutput {
        function Dump7ZipOutput( $file ) {
                $command = "7za a -bd -si " . wfEscapeShellArg( $file );
                // Suppress annoying useless crap from p7zip
                // Unfortunately this could suppress real error messages too
-               $command .= " >/dev/null 2>&1";
+               $command .= ' >' . wfGetNull() . ' 2>&1';
                parent::DumpPipeOutput( $command );
        }
 }
@@ -560,6 +569,7 @@ class Dump7ZipOutput extends DumpPipeOutput {
  * Dump output filter class.
  * This just does output filtering and streaming; XML formatting is done
  * higher up, so be careful in what you do.
+ * @addtogroup Dump
  */
 class DumpFilter {
        function DumpFilter( &$sink ) {
@@ -605,6 +615,7 @@ class DumpFilter {
 
 /**
  * Simple dump output filter to exclude all talk pages.
+ * @addtogroup Dump
  */
 class DumpNotalkFilter extends DumpFilter {
        function pass( $page ) {
@@ -614,6 +625,7 @@ class DumpNotalkFilter extends DumpFilter {
 
 /**
  * Dump output filter to include or exclude pages in a given set of namespaces.
+ * @addtogroup Dump
  */
 class DumpNamespaceFilter extends DumpFilter {
        var $invert = false;
@@ -668,6 +680,7 @@ class DumpNamespaceFilter extends DumpFilter {
 
 /**
  * Dump output filter to include only the last revision in each page sequence.
+ * @addtogroup Dump
  */
 class DumpLatestFilter extends DumpFilter {
        var $page, $pageString, $rev, $revString;
@@ -699,6 +712,7 @@ class DumpLatestFilter extends DumpFilter {
 
 /**
  * Base class for output stream; prints to stdout or buffer or whereever.
+ * @addtogroup Dump
  */
 class DumpMultiWriter {
        function DumpMultiWriter( $sinks ) {
@@ -753,4 +767,4 @@ function xmlsafe( $string ) {
        return $string;
 }
 
-?>
+