Merge "Remove methods in Block deprecated in 1.18"

[lhc/web/wiklou.git] / maintenance / update.php

diff --git a/maintenance/update.php b/maintenance/update.php
index 51bbd6f..beed720 100644 (file)
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -106,6 +106,8 @@ class UpdateMediaWiki extends Maintenance {
                $wgLang = Language::factory( 'en' );
                $wgTitle = Title::newFromText( "MediaWiki database updater" );
 
+               define( 'MW_UPDATER', true );
+
                $this->output( "MediaWiki {$wgVersion} Updater\n\n" );
 
                wfWaitForSlaves( 5 ); // let's not kill databases, shall we? ;) --tor
@@ -168,8 +170,8 @@ class UpdateMediaWiki extends Maintenance {
                }
                $time2 = new MWTimestamp();
 
-               $this->output( "\nDone.\n" );
-               $this->output( "\nThe job took " . $time2->diff( $time1 )->format( "%i:%S" ) . ".\n" );
+               $timeDiff = $time2->diff( $time1 );
+               $this->output( "\nDone in " . $timeDiff->format( "%i:%S" ) . ".\n" );
        }
 
        function afterFinalSetup() {