wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-25 14:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Respect oldid parameter in NWE"

Browse source
This commit is contained in:
jenkins-bot 2016-11-23 17:55:30 +00:00 committed by Gerrit Code Review
parent fde5c3c2ff b51720e165
commit f0a70ce6a2
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ApiVisualEditor.php
View file

@ -232,9 +232,9 @@ class ApiVisualEditor extends ApiBase {
} elseif ( $params['paction'] === 'wikitext' ) { } elseif ( $params['paction'] === 'wikitext' ) {
$apiParams = [ $apiParams = [
'action' => 'query', 'action' => 'query',
'titles' => $title->getPrefixedDBkey(), 'revids' => $oldid,
'prop' => 'revisions', 'prop' => 'revisions',
'rvprop' => 'content' 'rvprop' => 'content|ids'
]; ];
if ( isset( $params['section'] ) ) { if ( isset( $params['section'] ) ) {
@ -252,9 +252,14 @@ class ApiVisualEditor extends ApiBase {
$api->execute(); $api->execute();
$result = $api->getResult()->getResultData(); $result = $api->getResult()->getResultData();
$pid = $title->getArticleID(); $pid = $title->getArticleID();
$content = isset( $result['query']['pages'][$pid]['revisions']['0']['content'] ) ? $content = false;
$result['query']['pages'][$pid]['revisions']['0']['content'] : if ( isset( $result['query']['pages'][$pid]['revisions'] ) ) {
false; foreach ( $result['query']['pages'][$pid]['revisions'] as $revArr ) {
if ( $revArr['revid'] === $oldid ) {
$content = $revArr['content'];
}
}
}
if ( $content === false ) { if ( $content === false ) {
$this->dieUsage( 'Error contacting the document server', 'docserver' ); $this->dieUsage( 'Error contacting the document server', 'docserver' );
} }