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 "Avoid update.php suggestion on DB connection errors"
[lhc/web/wiklou.git]
/
maintenance
/
update.php
diff --git
a/maintenance/update.php
b/maintenance/update.php
index
b8af5e9
..
452b53c
100755
(executable)
--- a/
maintenance/update.php
+++ b/
maintenance/update.php
@@
-4,7
+4,6
@@
* Run all updaters.
*
* This is used when the database schema is modified and we need to apply patches.
* Run all updaters.
*
* This is used when the database schema is modified and we need to apply patches.
- * It is kept compatible with php 4 parsing so that it can give out a meaningful error.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-26,11
+25,6
@@
* @ingroup Maintenance
*/
* @ingroup Maintenance
*/
-if ( !function_exists( 'version_compare' ) || ( version_compare( PHP_VERSION, '5.3.3' ) < 0 ) ) {
- require dirname( __FILE__ ) . '/../includes/PHPVersionError.php';
- wfPHPVersionError( 'cli' );
-}
-
$wgUseMasterForMaintenance = true;
require_once __DIR__ . '/Maintenance.php';
$wgUseMasterForMaintenance = true;
require_once __DIR__ . '/Maintenance.php';
@@
-67,8
+61,7
@@
class UpdateMediaWiki extends Maintenance {
}
function compatChecks() {
}
function compatChecks() {
- // Avoid syntax error in PHP4
- $minimumPcreVersion = constant( 'Installer::MINIMUM_PCRE_VERSION' );
+ $minimumPcreVersion = Installer::MINIMUM_PCRE_VERSION;
list( $pcreVersion ) = explode( ' ', PCRE_VERSION, 2 );
if ( version_compare( $pcreVersion, $minimumPcreVersion, '<' ) ) {
list( $pcreVersion ) = explode( ' ', PCRE_VERSION, 2 );
if ( version_compare( $pcreVersion, $minimumPcreVersion, '<' ) ) {
@@
-179,7
+172,7
@@
class UpdateMediaWiki extends Maintenance {
$child = $this->runChild( $maint );
// LoggedUpdateMaintenance is checking the updatelog itself
$child = $this->runChild( $maint );
// LoggedUpdateMaintenance is checking the updatelog itself
- $isLoggedUpdate =
is_a( $child, 'LoggedUpdateMaintenance' )
;
+ $isLoggedUpdate =
$child instanceof LoggedUpdateMaintenance
;
if ( !$isLoggedUpdate && $updater->updateRowExists( $maint ) ) {
continue;
if ( !$isLoggedUpdate && $updater->updateRowExists( $maint ) ) {
continue;