wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-29 16:44:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Api: include preload content when section=new"

Browse source
This commit is contained in:
jenkins-bot 2017-09-25 15:55:14 +00:00 committed by Gerrit Code Review
parent 26ee19d2c1 33dc60838c
commit 69092c4b6c
1 changed files with 41 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
ApiVisualEditor.php
View file

@ -142,6 +142,37 @@ class ApiVisualEditor extends ApiBase {
); );
} }
protected function getPreloadContent( $preload, $params, $contextTitle, $parse = false ) {
$content = '';
$preloadTitle = Title::newFromText( $preload );
// Check for existence to avoid getting MediaWiki:Noarticletext
if ( $preloadTitle instanceof Title &&
$preloadTitle->exists() &&
$preloadTitle->userCan( 'read' )
) {
$preloadPage = WikiPage::factory( $preloadTitle );
if ( $preloadPage->isRedirect() ) {
$preloadTitle = $preloadPage->getRedirectTarget();
$preloadPage = WikiPage::factory( $preloadTitle );
}
$content = $preloadPage->getContent( Revision::RAW );
$parserOptions = ParserOptions::newFromUser( $this->getUser() );
$content = $content->preloadTransform(
$preloadTitle,
$parserOptions,
$params['preloadparams']
)->serialize();
if ( $parse ) {
// We need to turn this transformed wikitext into parsoid html
$content = $this->parseWikitextFragment( $contextTitle, $content );
}
}
return $content;
}
protected function getLangLinks( $title ) { protected function getLangLinks( $title ) {
$apiParams = [ $apiParams = [
'action' => 'query', 'action' => 'query',
@ -251,6 +282,12 @@ class ApiVisualEditor extends ApiBase {
if ( $section === 'new' ) { if ( $section === 'new' ) {
$content = ''; $content = '';
if ( $params['preload'] ) {
$content = $this->getPreloadContent(
$params['preload'], $params['preloadparams'], $title,
$params['paction'] !== 'wikitext'
);
}
} else { } else {
$apiParams['rvsection'] = $section; $apiParams['rvsection'] = $section;
@ -286,32 +323,10 @@ class ApiVisualEditor extends ApiBase {
$content = $this->parseWikitextFragment( $title, $content ); $content = $this->parseWikitextFragment( $title, $content );
} }
if ( $content === '' && $params['preload'] ) { if ( $content === '' && $params['preload'] ) {
$preloadTitle = Title::newFromText( $params['preload'] ); $content = $this->getPreloadContent(
// Check for existence to avoid getting MediaWiki:Noarticletext $params['preload'], $params['preloadparams'], $title,
if ( $preloadTitle instanceof Title && $params['paction'] !== 'wikitext'
$preloadTitle->exists() && );
$preloadTitle->userCan( 'read' )
) {
$preloadPage = WikiPage::factory( $preloadTitle );
if ( $preloadPage->isRedirect() ) {
$preloadTitle = $preloadPage->getRedirectTarget();
$preloadPage = WikiPage::factory( $preloadTitle );
}
$content = $preloadPage->getContent( Revision::RAW );
$parserOptions = ParserOptions::newFromUser( $user );
$content = $content->preloadTransform(
$preloadTitle,
$parserOptions,
$params['preloadparams']
)->serialize();
if ( $params['paction'] !== 'wikitext' ) {
// We need to turn this transformed wikitext into parsoid html
$content = $this->parseWikitextFragment( $title, $content );
}
}
} }
$baseTimestamp = wfTimestampNow(); $baseTimestamp = wfTimestampNow();
$oldid = 0; $oldid = 0;