From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 12 Sep 2016 03:46:43 +0000 (-0700)
Subject: Avoid "No transaction is active" saveFileDependencies() tests errors
X-Git-Tag: 1.31.0-rc.0~5657
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=fdd40afc4221cd723fd61b97eeb836e34051ee2e;p=lhc%2Fweb%2Fwiklou.git

Avoid "No transaction is active" saveFileDependencies() tests errors

Unit tests run in CLI mode without DBO_TRX

Change-Id: Icee9cf84cb9e057b329dd3960fcc9b238af478a3
---

diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index 43cf78bd59..44f7e1265f 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -486,9 +486,11 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 					]
 				);
 
-				$dbw->onTransactionResolution( function () use ( &$scopeLock ) {
-					ScopedCallback::consume( $scopeLock ); // release after commit
-				} );
+				if ( $dbw->trxLevel() ) {
+					$dbw->onTransactionResolution( function () use ( &$scopeLock ) {
+						ScopedCallback::consume( $scopeLock ); // release after commit
+					} );
+				}
 			}
 		} catch ( Exception $e ) {
 			wfDebugLog( 'resourceloader', __METHOD__ . ": failed to update DB: $e" );