wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-26 07:15:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use Parsoid API for action=parsefragment"

Browse source
This commit is contained in:
jenkins-bot 2014-04-19 00:13:43 +00:00 committed by Gerrit Code Review
parent f28f5e3996 509b3db9ba
commit b657f37795
1 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ApiVisualEditor.php
View file

@ -161,6 +161,15 @@ class ApiVisualEditor extends ApiBase {
);
}
protected function parseWikitextFragment( $title, $wikitext ) {
return $this->requestParsoid( 'POST', $title,
array(
'wt' => $wikitext,
'body' => 1,
)
);
}
protected function parseWikitext( $title ) {
$apiParams = array(
'action' => 'parse',
@ -197,29 +206,6 @@ class ApiVisualEditor extends ApiBase {
);
}
protected function parseWikitextFragment( $wikitext, $title = null ) {
$apiParams = array(
'action' => 'parse',
'title' => $title,
'prop' => 'text',
'disablepp' => true,
'pst' => true,
'text' => $wikitext
);
$api = new ApiMain(
new DerivativeRequest(
$this->getRequest(),
$apiParams,
false // was posted?
),
true // enable write?
);
$api->execute();
$result = $api->getResultData();
return isset( $result['parse']['text']['*'] ) ? $result['parse']['text']['*'] : false;
}
protected function diffWikitext( $title, $wikitext ) {
$apiParams = array(
'action' => 'query',
@ -426,9 +412,9 @@ class ApiVisualEditor extends ApiBase {
break;
case 'parsefragment':
$content = $this->parseWikitextFragment( $params['wikitext'], $page->getText() );
$content = $this->parseWikitextFragment( $page, $params['wikitext'] );
if ( $content === false ) {
$this->dieUsage( 'Error querying MediaWiki API', 'parsoidserver' );
$this->dieUsage( 'Error contacting the Parsoid server', 'parsoidserver' );
} else {
$result = array(
'result' => 'success',