Merge "Fix transaction warnings on test cleanup rollback()"

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 3399790..7ae7c35 100644 (file)
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -515,6 +515,7 @@ class MediaWiki {
                if ( $factory->laggedSlaveUsed() ) {
                        $maxAge = $this->config->get( 'CdnMaxageLagged' );
                        $this->context->getOutput()->lowerCdnMaxage( $maxAge );
+                       $request->response()->header( "X-Database-Lagged: true" );
                        wfDebugLog( 'replication', "Lagged DB used; CDN cache TTL limited to $maxAge seconds" );
                }
        }

diff --git a/resources/src/mediawiki/api.js b/resources/src/mediawiki/api.js
index 79aba77..481bd89 100644 (file)
--- a/resources/src/mediawiki/api.js
+++ b/resources/src/mediawiki/api.js
@@ -110,8 +110,6 @@
                /**
                 * Perform API post request
                 *
-                * TODO: Post actions for non-local hostnames will need proxy.
-                *
                 * @param {Object} parameters
                 * @param {Object} [ajaxOptions]
                 * @return {jQuery.Promise}