From: C. Scott Ananian <cscott@cscott.net>
Date: Mon, 22 Oct 2018 03:00:14 +0000 (-0400)
Subject: Rename WebInstallerOutput::addWikiTextInterface
X-Git-Tag: 1.34.0-rc.0~3701^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=b3141dac431989a7e599904d2924bb1847a19528;p=lhc%2Fweb%2Fwiklou.git

Rename WebInstallerOutput::addWikiTextInterface

Follow up to I89f3398cffa771afcd5a33cfd11eb8510af3e7f7: this patch
was intended to mirror a new method added to OutputPage in
Ia58910164baaca608cea3b24333b7d13ed773339 but the bikeshed was painted
a slightly different color before the OutputPage patch was merged, and
somehow this patch wasn't changed to match.  The `addWikiTextInterface`
name was never included in a released MW version, so we don't need to
deprecate it, just fix it.

Change-Id: I636cb0ea0f9631c4c5e2bc118f479aec76d2b231
---

diff --git a/includes/installer/WebInstallerDocument.php b/includes/installer/WebInstallerDocument.php
index 43fe7483c5..f79d272153 100644
--- a/includes/installer/WebInstallerDocument.php
+++ b/includes/installer/WebInstallerDocument.php
@@ -29,7 +29,7 @@ abstract class WebInstallerDocument extends WebInstallerPage {
 	public function execute() {
 		$text = $this->getFileContents();
 		$text = InstallDocFormatter::format( $text );
-		$this->parent->output->addWikiTextInterface( $text );
+		$this->parent->output->addWikiTextAsInterface( $text );
 		$this->startForm();
 		$this->endForm( false );
 	}
diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index dd76ce9242..6c1f2ec2b7 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -89,17 +89,18 @@ class WebInstallerOutput {
 
 	/**
 	 * @param string $text
-	 * @deprecated since 1.32; use addWikiTextInterface instead
+	 * @deprecated since 1.32; use addWikiTextAsInterface instead
 	 */
 	public function addWikiText( $text ) {
 		wfDeprecated( __METHOD__, '1.32' );
-		$this->addWikiTextInterface( $text );
+		$this->addWikiTextAsInterface( $text );
 	}
 
 	/**
 	 * @param string $text
+	 * @since 1.32
 	 */
-	public function addWikiTextInterface( $text ) {
+	public function addWikiTextAsInterface( $text ) {
 		$this->addHTML( $this->parent->parse( $text ) );
 	}
 
diff --git a/includes/installer/WebInstallerWelcome.php b/includes/installer/WebInstallerWelcome.php
index 0d7948495e..a4f031cd2f 100644
--- a/includes/installer/WebInstallerWelcome.php
+++ b/includes/installer/WebInstallerWelcome.php
@@ -30,12 +30,12 @@ class WebInstallerWelcome extends WebInstallerPage {
 				return 'continue';
 			}
 		}
-		$this->parent->output->addWikiTextInterface( wfMessage( 'config-welcome' )->plain() );
+		$this->parent->output->addWikiTextAsInterface( 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->addWikiTextInterface( wfMessage( 'config-copyright',
+			$this->parent->output->addWikiTextAsInterface( wfMessage( 'config-copyright',
 				SpecialVersion::getCopyrightAndAuthorList() )->plain() );
 			$this->startForm();
 			$this->endForm();