dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "SpecialLockdb and SpecialUnlockdb don't do database writes"
[lhc/web/wiklou.git]
/
maintenance
/
update.php
diff --git
a/maintenance/update.php
b/maintenance/update.php
index
7fe9770
..
775fa7b
100755
(executable)
--- 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 );
}
"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() {
}
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 );
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" );
$this->compatChecks();
} else {
$this->output( "Skipping compatibility checks, proceed at your own risk (Ctrl+C to abort)\n" );
- wfCount
d
own( 5 );
+ wfCount
D
own( 5 );
}
// Check external dependencies are up to date
}
// Check external dependencies are up to date
@@
-165,7
+175,7
@@
class UpdateMediaWiki extends Maintenance {
$updates[] = 'stats';
}
$updates[] = 'stats';
}
- $updater = DatabaseUpdater::newForD
b
( $db, $shared, $this );
+ $updater = DatabaseUpdater::newForD
B
( $db, $shared, $this );
$updater->doUpdates( $updates );
foreach ( $updater->getPostDatabaseUpdateMaintenance() as $maint ) {
$updater->doUpdates( $updates );
foreach ( $updater->getPostDatabaseUpdateMaintenance() as $maint ) {
@@
-191,7
+201,7
@@
class UpdateMediaWiki extends Maintenance {
$time2 = microtime( true );
$time2 = microtime( true );
- $timeDiff = $
wgL
ang->formatTimePeriod( $time2 - $time1 );
+ $timeDiff = $
l
ang->formatTimePeriod( $time2 - $time1 );
$this->output( "\nDone in $timeDiff.\n" );
}
$this->output( "\nDone in $timeDiff.\n" );
}