jenkins-bot has submitted this change and it was merged.
Change subject: Respect oldid parameter in NWE
......................................................................
Respect oldid parameter in NWE
Change-Id: I5a6388f50cc432421343974eb9f721f5e5a94d93
---
M ApiVisualEditor.php
1 file changed, 10 insertions(+), 5 deletions(-)
Approvals:
Jforrester: Looks good to me, but someone else must approve
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiVisualEditor.php b/ApiVisualEditor.php
index 648fa22..0ff5f49 100644
--- a/ApiVisualEditor.php
+++ b/ApiVisualEditor.php
@@ -232,9 +232,9 @@
} elseif ( $params['paction'] ===
'wikitext' ) {
$apiParams = [
'action' => 'query',
- 'titles' =>
$title->getPrefixedDBkey(),
+ 'revids' => $oldid,
'prop' => 'revisions',
- 'rvprop' => 'content'
+ 'rvprop' =>
'content|ids'
];
if ( isset( $params['section']
) ) {
@@ -252,9 +252,14 @@
$api->execute();
$result =
$api->getResult()->getResultData();
$pid = $title->getArticleID();
- $content = isset(
$result['query']['pages'][$pid]['revisions']['0']['content'] ) ?
-
$result['query']['pages'][$pid]['revisions']['0']['content'] :
- false;
+ $content = false;
+ if ( isset(
$result['query']['pages'][$pid]['revisions'] ) ) {
+ foreach (
$result['query']['pages'][$pid]['revisions'] as $revArr ) {
+ if (
$revArr['revid'] === $oldid ) {
+
$content = $revArr['content'];
+ }
+ }
+ }
if ( $content === false ) {
$this->dieUsage( 'Error
contacting the document server', 'docserver' );
}
--
To view, visit https://gerrit.wikimedia.org/r/323097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a6388f50cc432421343974eb9f721f5e5a94d93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
