X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fdeferred%2FDeferredUpdates.php;h=f5d22c15d69b49ac015aa1015a135f9074f77b16;hb=7fa7e6164d640f4523caa142b8ca4b3f15e1621b;hp=4b54378182246322ba6b989d9d780d610aa5f6e4;hpb=008428ce9e5f41995b5fa759d8cc3a4aa3cf6a89;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/deferred/DeferredUpdates.php b/includes/deferred/DeferredUpdates.php
index 4b54378182..f5d22c15d6 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -184,8 +184,6 @@ class DeferredUpdates {
 		$lbFactory = $services->getDBLoadBalancerFactory();
 		$method = RequestContext::getMain()->getRequest()->getMethod();
 
-		$ticket = $lbFactory->getEmptyTransactionTicket( __METHOD__ );
-
 		/** @var ErrorPageError $reportableError */
 		$reportableError = null;
 		/** @var DeferrableUpdate[] $updates Snapshot of queue */
@@ -199,7 +197,6 @@ class DeferredUpdates {
 			$updatesByType = [ 'data' => [], 'generic' => [] ];
 			foreach ( $updates as $du ) {
 				if ( $du instanceof DataUpdate ) {
-					$du->setTransactionTicket( $ticket );
 					$updatesByType['data'][] = $du;
 				} else {
 					$updatesByType['generic'][] = $du;
@@ -225,10 +222,6 @@ class DeferredUpdates {
 							$firstKey = key( self::$executeContext['subqueue'] );
 							unset( self::$executeContext['subqueue'][$firstKey] );
 
-							if ( $subUpdate instanceof DataUpdate ) {
-								$subUpdate->setTransactionTicket( $ticket );
-							}
-
 							$guiError = self::handleUpdate( $subUpdate, $lbFactory, $mode, $stage );
 							$reportableError = $reportableError ?: $guiError;
 						}
@@ -300,6 +293,10 @@ class DeferredUpdates {
 	 * @since 1.34
 	 */
 	public static function attemptUpdate( DeferrableUpdate $update, ILBFactory $lbFactory ) {
+		if ( $update instanceof DataUpdate ) {
+			$update->setTransactionTicket( $lbFactory->getEmptyTransactionTicket( __METHOD__ ) );
+		}
+
 		if (
 			$update instanceof TransactionRoundAwareUpdate &&
 			$update->getTransactionRoundRequirement() == $update::TRX_ROUND_ABSENT