Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tidy and rename WebInstallerOutput::addWikiText() to addWikiTextInterface()

Browse source 
This change parallels the new method added to OutputPage in
Ia58910164baaca608cea3b24333b7d13ed773339 and ensures that the
content added is always tidied.  We leave the old alias in
place for now in accordance with our deprecation policy.

Change-Id: I89f3398cffa771afcd5a33cfd11eb8510af3e7f7
This commit is contained in:
C. Scott Ananian 2018-09-21 12:25:26 -04:00
parent ed6d53fd38
commit 1c10bfb034
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
includes/installer/Installer.php
View file

@ -454,6 +454,7 @@ abstract class Installer {
$this->parserTitle = Title::newFromText( 'Installer' );
$this->parserOptions = new ParserOptions( $wgUser ); // language will be wrong :(
$this->parserOptions->setTidy( true );
// Don't try to access DB before user language is initialised
$this->setParserLanguage( Language::factory( 'en' ) );
}

2
includes/installer/WebInstallerDocument.php
View file

@ -29,7 +29,7 @@ abstract class WebInstallerDocument extends WebInstallerPage {
public function execute() {
$text = $this->getFileContents();
$text = InstallDocFormatter::format( $text );
$this->parent->output->addWikiText( $text );
$this->parent->output->addWikiTextInterface( $text );
$this->startForm();
$this->endForm( false );
}

9
includes/installer/WebInstallerOutput.php
View file

@ -89,8 +89,17 @@ class WebInstallerOutput {
/**
* @param string $text
* @deprecated since 1.32; use addWikiTextInterface instead
*/
public function addWikiText( $text ) {
wfDeprecated( __METHOD__, '1.32' );
$this->addWikiTextInterface( $text );
}
/**
* @param string $text
*/
public function addWikiTextInterface( $text ) {
$this->addHTML( $this->parent->parse( $text ) );
}

4
includes/installer/WebInstallerWelcome.php
View file

@ -30,12 +30,12 @@ class WebInstallerWelcome extends WebInstallerPage {
return 'continue';
}
}
$this->parent->output->addWikiText( wfMessage( 'config-welcome' )->plain() );
$this->parent->output->addWikiTextInterface( wfMessage( 'config-welcome' )->plain() );
$status = $this->parent->doEnvironmentChecks();
if ( $status->isGood() ) {
$this->parent->output->addHTML( '<span class="success-message">' .
wfMessage( 'config-env-good' )->escaped() . '</span>' );
$this->parent->output->addWikiText( wfMessage( 'config-copyright',
$this->parent->output->addWikiTextInterface( wfMessage( 'config-copyright',
SpecialVersion::getCopyrightAndAuthorList() )->plain() );
$this->startForm();
$this->endForm();