No point in fetching the result in Database::unlock() if we're not using it anyway.

[lhc/web/wiklou.git] / maintenance / backup.inc

diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index b770c5c..bf52c1f 100644 (file)
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -18,15 +18,22 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @addtogroup SpecialPage
+ * @file
+ * @ingroup Dump Maintenance
  */
 
+/**
+ * @ingroup Dump Maintenance
+ */
 class DumpDBZip2Output extends DumpPipeOutput {
        function DumpDBZip2Output( $file ) {
                parent::DumpPipeOutput( "dbzip2", $file );
        }
 }
 
+/**
+ * @ingroup Dump Maintenance
+ */
 class BackupDumper {
        var $reportingInterval = 100;
        var $reporting = true;
@@ -40,6 +47,7 @@ class BackupDumper {
        var $endId      = 0;
        var $sink       = null; // Output filters
        var $stubText   = false; // include rev_text_id instead of text; for 2-pass dump
+       var $dumpUploads = false;
 
        function BackupDumper( $args ) {
                $this->stderr = fopen( "php://stderr", "wt" );
@@ -170,12 +178,14 @@ class BackupDumper {
        function dump( $history, $text = MW_EXPORT_TEXT ) {
                # Notice messages will foul up your XML output even if they're
                # relatively harmless.
-               ini_set( 'display_errors', false );
+               if( ini_get( 'display_errors' ) )
+                       ini_set( 'display_errors', 'stderr' );
 
                $this->initProgress( $history );
 
-               $db =& $this->backupDb();
+               $db = $this->backupDb();
                $exporter = new WikiExporter( $db, $history, WikiExporter::STREAM, $text );
+               $exporter->dumpUploads = $this->dumpUploads;
 
                $wrapper = new ExportProgressFilter( $this->sink, $this );
                $exporter->setOutputSink( $wrapper );
@@ -214,15 +224,18 @@ class BackupDumper {
                $this->startTime = wfTime();
        }
 
-       function &backupDb() {
+       function backupDb() {
                global $wgDBadminuser, $wgDBadminpassword;
                global $wgDBname, $wgDebugDumpSql, $wgDBtype;
                $flags = ($wgDebugDumpSql ? DBO_DEBUG : 0) | DBO_DEFAULT; // god-damn hack
 
                $class = 'Database' . ucfirst($wgDBtype);
                $db = new $class( $this->backupServer(), $wgDBadminuser, $wgDBadminpassword, $wgDBname, false, $flags );
-               $timeout = 3600 * 24;
-               $db->set_timeout($timeout);
+               
+               // Discourage the server from disconnecting us if it takes a long time
+               // to read out the big ol' batch query.
+               $db->setTimeout( 3600 * 24 );
+               
                return $db;
        }
 
@@ -289,5 +302,3 @@ class ExportProgressFilter extends DumpFilter {
                $this->progress->revCount();
        }
 }
-
-?>