From 99b05dcc6d981c770b7c835a5d4df7863870061c Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 20 May 2015 23:06:05 -0700 Subject: [PATCH] Make sure $dbw is an object in DeferredUpdates::addUpdate() Change-Id: Ib52574bc7f2e13bf06f595e349a7b3ccea425056 --- includes/deferred/DeferredUpdates.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/deferred/DeferredUpdates.php b/includes/deferred/DeferredUpdates.php index 29bb8d7712..082d4350df 100644 --- a/includes/deferred/DeferredUpdates.php +++ b/includes/deferred/DeferredUpdates.php @@ -65,7 +65,7 @@ class DeferredUpdates { $lb = wfGetLB(); $dbw = $lb->getAnyOpenConnection( $lb->getWriterIndex() ); // Do the update as soon as there is no transaction - if ( $dbw->trxLevel() ) { + if ( $dbw && $dbw->trxLevel() ) { $waitingOnTrx = true; $dbw->onTransactionIdle( function() use ( &$waitingOnTrx ) { DeferredUpdates::doUpdates(); -- 2.20.1