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 "Remove JS for FancyCaptcha adjustment"
[lhc/web/wiklou.git]
/
maintenance
/
doMaintenance.php
diff --git
a/maintenance/doMaintenance.php
b/maintenance/doMaintenance.php
index
c93a971
..
4b9ad9c
100644
(file)
--- a/
maintenance/doMaintenance.php
+++ b/
maintenance/doMaintenance.php
@@
-92,29
+92,26
@@
if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
}
}
}
}
-$maintenance->setConfig( ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) );
$maintenance->finalSetup();
// Some last includes
require_once "$IP/includes/Setup.php";
$maintenance->finalSetup();
// Some last includes
require_once "$IP/includes/Setup.php";
+// Initialize main config instance
+$maintenance->setConfig( ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) );
+
// Do the work
// 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 ( Exception $mwe ) {
- echo $mwe->getText();
- exit( 1 );
-}
+// Commit and close up!
+$factory = wfGetLBFactory();
+$factory->commitMasterChanges();
+$factory->shutdown();