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 "jquery.textSelection.test: Fix regression in Opera"
[lhc/web/wiklou.git]
/
maintenance
/
update.php
diff --git
a/maintenance/update.php
b/maintenance/update.php
index
ba1d8cd
..
f69a9b0
100644
(file)
--- a/
maintenance/update.php
+++ b/
maintenance/update.php
@@
-26,9
+26,8
@@
*/
if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.3.2' ) < 0 ) ) {
*/
if ( !function_exists( 'version_compare' ) || ( version_compare( phpversion(), '5.3.2' ) < 0 ) ) {
- echo "You are using PHP version " . phpversion() . " but MediaWiki needs PHP 5.3.2 or higher. ABORTING.\n" .
- "Check if you have a newer php executable with a different name, such as php5.\n";
- die( 1 );
+ require( dirname( __FILE__ ) . '/../includes/PHPVersionError.php' );
+ wfPHPVersionError( 'cli' );
}
$wgUseMasterForMaintenance = true;
}
$wgUseMasterForMaintenance = true;
@@
-154,7
+153,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 =
( $child instanceof LoggedUpdateMaintenance
);
+ $isLoggedUpdate =
is_a( $child, 'LoggedUpdateMaintenance'
);
if ( !$isLoggedUpdate && $updater->updateRowExists( $maint ) ) {
continue;
if ( !$isLoggedUpdate && $updater->updateRowExists( $maint ) ) {
continue;