summaryrefslogtreecommitdiff
path: root/maintenance/backup.inc
diff options
context:
space:
mode:
Diffstat (limited to 'maintenance/backup.inc')
-rw-r--r--maintenance/backup.inc16
1 files changed, 6 insertions, 10 deletions
diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index d3603bd1..8b4b6726 100644
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -168,9 +168,6 @@ class BackupDumper {
}
function dump( $history, $text = MW_EXPORT_TEXT ) {
- # This shouldn't happen if on console... ;)
- header( 'Content-type: text/html; charset=UTF-8' );
-
# Notice messages will foul up your XML output even if they're
# relatively harmless.
ini_set( 'display_errors', false );
@@ -206,11 +203,11 @@ class BackupDumper {
* Initialise starting time and maximum revision count.
* We'll make ETA calculations based an progress, assuming relatively
* constant per-revision rate.
- * @param int $history MW_EXPORT_CURRENT or MW_EXPORT_FULL
+ * @param int $history WikiExporter::CURRENT or WikiExporter::FULL
*/
- function initProgress( $history = MW_EXPORT_FULL ) {
- $table = ($history == MW_EXPORT_CURRENT) ? 'page' : 'revision';
- $field = ($history == MW_EXPORT_CURRENT) ? 'page_id' : 'rev_id';
+ function initProgress( $history = WikiExporter::FULL ) {
+ $table = ($history == WikiExporter::CURRENT) ? 'page' : 'revision';
+ $field = ($history == WikiExporter::CURRENT) ? 'page_id' : 'rev_id';
$dbr =& wfGetDB( DB_SLAVE );
$this->maxCount = $dbr->selectField( $table, "MAX($field)", '', 'BackupDumper::dump' );
@@ -221,7 +218,7 @@ class BackupDumper {
global $wgDBadminuser, $wgDBadminpassword;
global $wgDBname, $wgDebugDumpSql;
$flags = ($wgDebugDumpSql ? DBO_DEBUG : 0) | DBO_DEFAULT; // god-damn hack
- $db =& new Database( $this->backupServer(), $wgDBadminuser, $wgDBadminpassword, $wgDBname, false, $flags );
+ $db = new Database( $this->backupServer(), $wgDBadminuser, $wgDBadminpassword, $wgDBname, false, $flags );
$timeout = 3600 * 24;
$db->query( "SET net_read_timeout=$timeout" );
$db->query( "SET net_write_timeout=$timeout" );
@@ -265,9 +262,8 @@ class BackupDumper {
$revrate = '-';
$etats = '-';
}
- global $wgDBname;
$this->progress( sprintf( "%s: %s %d pages (%0.3f/sec), %d revs (%0.3f/sec), ETA %s [max %d]",
- $now, $wgDBname, $this->pageCount, $rate, $this->revCount, $revrate, $etats, $this->maxCount ) );
+ $now, wfWikiID(), $this->pageCount, $rate, $this->revCount, $revrate, $etats, $this->maxCount ) );
}
}