Merge "Hide TOC with CSS instead of JavaScript"

[lhc/web/wiklou.git] / includes / Storage / DerivedPageDataUpdater.php

diff --git a/includes/Storage/DerivedPageDataUpdater.php b/includes/Storage/DerivedPageDataUpdater.php
index cc72754..73463b5 100644 (file)
--- a/includes/Storage/DerivedPageDataUpdater.php
+++ b/includes/Storage/DerivedPageDataUpdater.php
@@ -241,7 +241,7 @@ class DerivedPageDataUpdater implements IDBAccessObject {
         * @param JobQueueGroup $jobQueueGroup
         * @param MessageCache $messageCache
         * @param Language $contentLanguage
-        * @param LoggerInterface $saveParseLogger
+        * @param LoggerInterface|null $saveParseLogger
         */
        public function __construct(
                WikiPage $wikiPage,
@@ -1310,7 +1310,7 @@ class DerivedPageDataUpdater implements IDBAccessObject {
                                        // stale data from REPEATABLE-READ snapshots.
                                        // HACK: But don't use a fresh connection in unit tests, since it would not have
                                        // the fake tables. This should be handled by the LoadBalancer!
-                                       $flags = defined( 'MW_PHPUNIT_TEST' ) ? 0 : $lb::CONN_TRX_AUTO;
+                                       $flags = defined( 'MW_PHPUNIT_TEST' ) ? 0 : $lb::CONN_TRX_AUTOCOMMIT;
                                        $db = $lb->getConnectionRef( $dbIndex, [], $this->getWikiId(), $flags );
 
                                        return 1 + (int)$db->selectField(