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 "Html::openElement: Don't omit closing tags."
[lhc/web/wiklou.git]
/
maintenance
/
doMaintenance.php
diff --git
a/maintenance/doMaintenance.php
b/maintenance/doMaintenance.php
index
28a0545
..
cc2167e
100644
(file)
--- a/
maintenance/doMaintenance.php
+++ b/
maintenance/doMaintenance.php
@@
-44,6
+44,7
@@
if ( !$maintClass || !class_exists( $maintClass ) ) {
}
// Get an object to start us off
}
// Get an object to start us off
+/** @var Maintenance $maintenance */
$maintenance = new $maintClass();
// Basic sanity checks and such
$maintenance = new $maintClass();
// Basic sanity checks and such
@@
-55,8
+56,8
@@
$self = $maintenance->getName();
# Start the autoloader, so that extensions can derive classes from core files
require_once "$IP/includes/AutoLoader.php";
# Start the autoloader, so that extensions can derive classes from core files
require_once "$IP/includes/AutoLoader.php";
-#
Stub the profiler
-require_once "$IP/includes/profiler/Profiler.php";
+#
Grab profiling functions
+require_once "$IP/includes/profiler/Profiler
Functions
.php";
# Start the profiler
$wgProfiler = array();
# Start the profiler
$wgProfiler = array();
@@
-67,6
+68,7
@@
if ( file_exists( "$IP/StartProfiler.php" ) ) {
// Some other requires
require_once "$IP/includes/Defines.php";
require_once "$IP/includes/DefaultSettings.php";
// Some other requires
require_once "$IP/includes/Defines.php";
require_once "$IP/includes/DefaultSettings.php";
+require_once "$IP/includes/GlobalFunctions.php";
# Load composer's autoloader if present
if ( is_readable( "$IP/vendor/autoload.php" ) ) {
# Load composer's autoloader if present
if ( is_readable( "$IP/vendor/autoload.php" ) ) {
@@
-89,28
+91,25
@@
if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
$wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
}
}
$wgLocalisationCacheConf['storeClass'] = 'LCStoreNull';
}
}
+
+$maintenance->setConfig( ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) );
$maintenance->finalSetup();
// Some last includes
require_once "$IP/includes/Setup.php";
// Do the work
$maintenance->finalSetup();
// Some last includes
require_once "$IP/includes/Setup.php";
// Do the work
-try {
- $maintenance->execute();
+$maintenance->execute();
-
// Potentially debug globals
-
$maintenance->globals();
+// Potentially debug globals
+$maintenance->globals();
-
// Perform deferred updates.
-
DeferredUpdates::doUpdates( 'commit' );
+// Perform deferred updates.
+DeferredUpdates::doUpdates( 'commit' );
-
// log profiling info
-
wfLogProfilingData();
+// log profiling info
+wfLogProfilingData();
- // Commit and close up!
- $factory = wfGetLBFactory();
- $factory->commitMasterChanges();
- $factory->shutdown();
-} catch ( MWException $mwe ) {
- echo $mwe->getText();
- exit( 1 );
-}
+// Commit and close up!
+$factory = wfGetLBFactory();
+$factory->commitMasterChanges();
+$factory->shutdown();