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 "Revert "Temporary hax to hide cawiki's hacked in search sidebar""
[lhc/web/wiklou.git]
/
maintenance
/
doMaintenance.php
diff --git
a/maintenance/doMaintenance.php
b/maintenance/doMaintenance.php
index
60b24a2
..
e649c9d
100644
(file)
--- a/
maintenance/doMaintenance.php
+++ b/
maintenance/doMaintenance.php
@@
-25,6
+25,7
@@
* @file
* @ingroup Maintenance
*/
* @file
* @ingroup Maintenance
*/
+use MediaWiki\MediaWikiServices;
if ( !defined( 'RUN_MAINTENANCE_IF_MAIN' ) ) {
echo "This file must be included after Maintenance.php\n";
if ( !defined( 'RUN_MAINTENANCE_IF_MAIN' ) ) {
echo "This file must be included after Maintenance.php\n";
@@
-97,7
+98,7
@@
$maintenance->finalSetup();
require_once "$IP/includes/Setup.php";
// Initialize main config instance
require_once "$IP/includes/Setup.php";
// Initialize main config instance
-$maintenance->setConfig(
ConfigFactory::getDefaultInstance()->makeConfig( 'main'
) );
+$maintenance->setConfig(
MediaWikiServices::getInstance()->getMainConfig(
) );
// Sanity-check required extensions are installed
$maintenance->checkRequiredExtensions();
// Sanity-check required extensions are installed
$maintenance->checkRequiredExtensions();
@@
-113,12
+114,13
@@
$maintenance->execute();
$maintenance->globals();
// Perform deferred updates.
$maintenance->globals();
// Perform deferred updates.
+$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+$lbFactory->commitMasterChanges( $maintClass );
DeferredUpdates::doUpdates();
// log profiling info
wfLogProfilingData();
// Commit and close up!
DeferredUpdates::doUpdates();
// log profiling info
wfLogProfilingData();
// Commit and close up!
-$factory = wfGetLBFactory();
-$factory->commitMasterChanges( 'doMaintenance' );
-$factory->shutdown( $factory::SHUTDOWN_NO_CHRONPROT );
+$lbFactory->commitMasterChanges( 'doMaintenance' );
+$lbFactory->shutdown( $lbFactory::SHUTDOWN_NO_CHRONPROT );