X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=blobdiff_plain;f=includes%2Fdeferred%2FDeferredUpdates.php;h=3b7de9df8000a529cdaab670f0d2d9bf593617b3;hb=1f628f0dc7a607a930a0b9a0cc5fc03ff0fe986e;hp=a14b25c720abd47790d9b4350ef4ced01c0fd32e;hpb=55736dd0b678c88fd7ec0ada7e884b09737b39fd;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/deferred/DeferredUpdates.php b/includes/deferred/DeferredUpdates.php
index a14b25c720..3b7de9df80 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -263,7 +263,8 @@ class DeferredUpdates {
 			if ( $mode === 'enqueue' && $update instanceof EnqueueableDataUpdate ) {
 				// Run only the job enqueue logic to complete the update later
 				$spec = $update->getAsJobSpecification();
-				JobQueueGroup::singleton( $spec['wiki'] )->push( $spec['job'] );
+				$domain = $spec['domain'] ?? $spec['wiki'];
+				JobQueueGroup::singleton( $domain )->push( $spec['job'] );
 			} elseif ( $update instanceof TransactionRoundDefiningUpdate ) {
 				$update->doUpdate();
 			} else {
@@ -280,16 +281,6 @@ class DeferredUpdates {
 			}
 			MWExceptionHandler::rollbackMasterChangesAndLog( $e );
 
-			// Try to push the update as a job so it can run later perhaps
-			if ( $mode !== 'enqueue' && $update instanceof EnqueueableDataUpdate ) {
-				try {
-					$spec = $update->getAsJobSpecification();
-					JobQueueGroup::singleton( $spec['wiki'] )->push( $spec['job'] );
-				} catch ( Exception $e ) {
-					MWExceptionHandler::rollbackMasterChangesAndLog( $e );
-				}
-			}
-
 			// VW-style hack to work around T190178, so we can make sure
 			// PageMetaDataUpdater doesn't throw exceptions.
 			if ( defined( 'MW_PHPUNIT_TEST' ) ) {
@@ -345,7 +336,8 @@ class DeferredUpdates {
 		foreach ( $updates as $update ) {
 			if ( $update instanceof EnqueueableDataUpdate ) {
 				$spec = $update->getAsJobSpecification();
-				JobQueueGroup::singleton( $spec['wiki'] )->push( $spec['job'] );
+				$domain = $spec['domain'] ?? $spec['wiki'];
+				JobQueueGroup::singleton( $domain )->push( $spec['job'] );
 			} else {
 				$remaining[] = $update;
 			}