jenkins-bot has submitted this change and it was merged.
Change subject: ApiPageSet lazy loads content models
......................................................................
ApiPageSet lazy loads content models
A preceding patch, I7eff0bff, adjusts multiple Title methods to load the
content model from the database if it is not known. This patch
adjusts ApiPageSet to query for the content model with the initial data
load rather than allowing the lazy loading to pull in the content
model one at a time as requested.
`
Bug: T86612
Change-Id: I9a9272da729d9323efde76a3c0a09f55127db537
(cherry picked from commit 2ddd236cdf786f02283ef3ce4cc11777598fd55e)
---
M includes/api/ApiPageSet.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index 1417ef7..55658bf 100644
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -315,6 +315,10 @@
$pageFlds['page_is_redirect'] = null;
}
+ if ( $this->getConfig()->get( 'ContentHandlerUseDB' ) ) {
+ $pageFlds['page_content_model'] = null;
+ }
+
// only store non-default fields
$this->mRequestedPageFields = array_diff_key(
$this->mRequestedPageFields, $pageFlds );
--
To view, visit https://gerrit.wikimedia.org/r/187223
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a9272da729d9323efde76a3c0a09f55127db537
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.25wmf14
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
