X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fupdate.php;h=775fa7bed41c2ae837b58bb80c123c3d9671243c;hb=3198421632712b2a389eec5f222fd1c344ea74fc;hp=7fe9770a74b10a4573a70a8dea54162c7f53672b;hpb=ae69acacf567077b3f49d1fe6c3f3770e72a9093;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/update.php b/maintenance/update.php
index 7fe9770a74..775fa7bed4 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -83,6 +83,13 @@ class UpdateMediaWiki extends Maintenance {
 				"ABORTING (see https://bugs.php.net/bug.php?id=45996).\n",
 				true );
 		}
+
+		if ( !function_exists( 'mb_strlen' ) ) {
+			$this->error(
+				"MediaWiki now requires the mbstring PHP extension, your system doesn't have it.\n"
+				. "ABORTING.\n",
+				true );
+		}
 	}
 
 	function execute() {
@@ -112,7 +119,10 @@ class UpdateMediaWiki extends Maintenance {
 			}
 		}
 
-		$wgLang = Language::factory( 'en' );
+		$lang = Language::factory( 'en' );
+		// Set global language to ensure localised errors are in English (bug 20633)
+		RequestContext::getMain()->setLanguage( $lang );
+		$wgLang = $lang; // BackCompat
 
 		define( 'MW_UPDATER', true );
 
@@ -124,7 +134,7 @@ class UpdateMediaWiki extends Maintenance {
 			$this->compatChecks();
 		} else {
 			$this->output( "Skipping compatibility checks, proceed at your own risk (Ctrl+C to abort)\n" );
-			wfCountdown( 5 );
+			wfCountDown( 5 );
 		}
 
 		// Check external dependencies are up to date
@@ -165,7 +175,7 @@ class UpdateMediaWiki extends Maintenance {
 			$updates[] = 'stats';
 		}
 
-		$updater = DatabaseUpdater::newForDb( $db, $shared, $this );
+		$updater = DatabaseUpdater::newForDB( $db, $shared, $this );
 		$updater->doUpdates( $updates );
 
 		foreach ( $updater->getPostDatabaseUpdateMaintenance() as $maint ) {
@@ -191,7 +201,7 @@ class UpdateMediaWiki extends Maintenance {
 
 		$time2 = microtime( true );
 
-		$timeDiff = $wgLang->formatTimePeriod( $time2 - $time1 );
+		$timeDiff = $lang->formatTimePeriod( $time2 - $time1 );
 		$this->output( "\nDone in $timeDiff.\n" );
 	}