X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Fdeferred%2FMWCallableUpdate.php;h=9803b7a491b10312e5268aedb58b14038974d583;hb=6e62381aaa2e0d0ee572e3827800d05d9a5c67a4;hp=5247e97cf10682fcbb9fdaca787a750bb633d9de;hpb=3d653e8ab542e502f4dcf574c9e4917cf56a5f8c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/deferred/MWCallableUpdate.php b/includes/deferred/MWCallableUpdate.php
index 5247e97cf1..9803b7a491 100644
--- a/includes/deferred/MWCallableUpdate.php
+++ b/includes/deferred/MWCallableUpdate.php
@@ -1,5 +1,7 @@
 <?php
 
+use Wikimedia\Rdbms\IDatabase;
+
 /**
  * Deferrable Update for closure/callback
  */
@@ -12,14 +14,18 @@ class MWCallableUpdate implements DeferrableUpdate, DeferrableCallback {
 	/**
 	 * @param callable $callback
 	 * @param string $fname Calling method
-	 * @param IDatabase|null $dbw Abort if this DB is rolled back [optional] (since 1.28)
+	 * @param IDatabase|IDatabase[]|null $dbws Abort if any of the specified DB handles have
+	 *   a currently pending transaction which later gets rolled back [optional] (since 1.28)
 	 */
-	public function __construct( callable $callback, $fname = 'unknown', IDatabase $dbw = null ) {
+	public function __construct( callable $callback, $fname = 'unknown', $dbws = [] ) {
 		$this->callback = $callback;
 		$this->fname = $fname;
 
-		if ( $dbw && $dbw->trxLevel() ) {
-			$dbw->onTransactionResolution( [ $this, 'cancelOnRollback' ], $fname );
+		$dbws = is_array( $dbws ) ? $dbws : [ $dbws ];
+		foreach ( $dbws as $dbw ) {
+			if ( $dbw && $dbw->trxLevel() ) {
+				$dbw->onTransactionResolution( [ $this, 'cancelOnRollback' ], $fname );
+			}
 		}
 	}