From 819a692635a313937b9e49b071b647812a66cb48 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 1 Aug 2019 15:57:22 -0400 Subject: [PATCH] Fix bogus field use in RevisionRenderer::getSpeculativePageId This field was renamed, causing a functional merge conflict Follow-up 5099ee9f7273 Bug: T229589 Change-Id: I7a6bb68ff1fe320313276dc5a67c70de6715ccb6 --- includes/Revision/RevisionRenderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/Revision/RevisionRenderer.php b/includes/Revision/RevisionRenderer.php index bbda0e5f43..ca4bb73bb0 100644 --- a/includes/Revision/RevisionRenderer.php +++ b/includes/Revision/RevisionRenderer.php @@ -191,7 +191,7 @@ class RevisionRenderer { ? 0 : ILoadBalancer::CONN_TRX_AUTOCOMMIT; - $db = $this->loadBalancer->getConnectionRef( $dbIndex, [], $this->wikiId, $flags ); + $db = $this->loadBalancer->getConnectionRef( $dbIndex, [], $this->dbDomain, $flags ); return 1 + (int)$db->selectField( 'page', -- 2.20.1