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 "Pass user to FileRepo::getUploadStash"
[lhc/web/wiklou.git]
/
maintenance
/
update.php
diff --git
a/maintenance/update.php
b/maintenance/update.php
index
a51564a
..
8ab1ddb
100755
(executable)
--- a/
maintenance/update.php
+++ b/
maintenance/update.php
@@
-26,7
+26,7
@@
* @ingroup Maintenance
*/
* @ingroup Maintenance
*/
-if ( !function_exists( 'version_compare' ) || ( version_compare(
phpversion(), '5.3.2
' ) < 0 ) ) {
+if ( !function_exists( 'version_compare' ) || ( version_compare(
PHP_VERSION, '5.3.3
' ) < 0 ) ) {
require dirname( __FILE__ ) . '/../includes/PHPVersionError.php';
wfPHPVersionError( 'cli' );
}
require dirname( __FILE__ ) . '/../includes/PHPVersionError.php';
wfPHPVersionError( 'cli' );
}
@@
-131,6
+131,10
@@
class UpdateMediaWiki extends Maintenance {
wfCountdown( 5 );
}
wfCountdown( 5 );
}
+ // Check external dependencies are up to date
+ $composerLockUpToDate = $this->runChild( 'CheckComposerLockUpToDate' );
+ $composerLockUpToDate->execute();
+
# Attempt to connect to the database as a privileged user
# This will vomit up an error if there are permissions problems
$db = wfGetDB( DB_MASTER );
# Attempt to connect to the database as a privileged user
# This will vomit up an error if there are permissions problems
$db = wfGetDB( DB_MASTER );
@@
-178,11
+182,12
@@
class UpdateMediaWiki extends Maintenance {
}
}
}
}
+ $updater->setFileAccess();
if ( !$this->hasOption( 'nopurge' ) ) {
$updater->purgeCache();
}
if ( !$this->hasOption( 'nopurge' ) ) {
$updater->purgeCache();
}
- $time2 = new MWTimestamp();
+ $time2 = new MWTimestamp();
$timeDiff = $time2->diff( $time1 );
$this->output( "\nDone in " . $timeDiff->format( "%i:%S" ) . ".\n" );
}
$timeDiff = $time2->diff( $time1 );
$this->output( "\nDone in " . $timeDiff->format( "%i:%S" ) . ".\n" );
}