wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-12-04 10:48:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ApiVisualEditor: Return 'etag' with 'content' for preloaded content"

Browse source
This commit is contained in:
jenkins-bot 2019-10-24 20:06:11 +00:00 committed by Gerrit Code Review
parent a249a7b69b 57ad605dc4
commit 51a84ffef7
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
includes/ApiVisualEditor.php
View file

@ -201,10 +201,9 @@ class ApiVisualEditor extends ApiBase {
* @param string $preload The title of the page to use as the preload content
* @param string[] $params The preloadTransform parameters to pass in, if any
* @param Title $contextTitle The contextual page title against which to parse the preload
* @param bool $parse Whether to parse the preload content
* @return string The parsed content
* @return string Wikitext content
*/
protected function getPreloadContent( $preload, $params, Title $contextTitle, $parse = false ) {
protected function getPreloadContent( $preload, $params, Title $contextTitle ) {
$content = '';
$preloadTitle = Title::newFromText( $preload );
// Check for existence to avoid getting MediaWiki:Noarticletext
@ -226,11 +225,6 @@ class ApiVisualEditor extends ApiBase {
$parserOptions,
(array)$params
)->serialize();
if ( $parse ) {
// We need to turn this transformed wikitext into parsoid html
$content = $this->parseWikitextFragment( $contextTitle, $content, true )['body'];
}
}
return $content;
}
@ -342,8 +336,7 @@ class ApiVisualEditor extends ApiBase {
$content = '';
if ( !empty( $params['preload'] ) ) {
$content = $this->getPreloadContent(
$params['preload'], $params['preloadparams'], $title,
$params['paction'] !== 'wikitext'
$params['preload'], $params['preloadparams'], $title
);
$preloaded = true;
}
@ -380,16 +373,17 @@ class ApiVisualEditor extends ApiBase {
$content = '';
Hooks::run( 'EditFormPreloadText', [ &$content, &$title ] );
// @phan-suppress-next-line PhanSuspiciousValueComparison Known false positive with hooks
if ( $content !== '' && $params['paction'] !== 'wikitext' ) {
$content = $this->parseWikitextFragment( $title, $content, true )['body'];
}
if ( $content === '' && !empty( $params['preload'] ) ) {
$content = $this->getPreloadContent(
$params['preload'], $params['preloadparams'], $title,
$params['paction'] !== 'wikitext'
$params['preload'], $params['preloadparams'], $title
);
$preloaded = true;
}
if ( $content !== '' && $params['paction'] !== 'wikitext' ) {
$response = $this->parseWikitextFragment( $title, $content, true );
$content = $response['body'];
$restbaseHeaders = $response['headers'];
}
$baseTimestamp = wfTimestampNow();
$oldid = 0;
$restoring = false;