Merge "Type hint against LinkTarget in WatchedItemStore"

[lhc/web/wiklou.git] / includes / installer / WebInstallerOutput.php

diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index 914a69e..991e484 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -90,15 +90,6 @@ class WebInstallerOutput {
                $this->flush();
        }
 
-       /**
-        * @param string $text
-        * @deprecated since 1.32; use addWikiTextAsInterface instead
-        */
-       public function addWikiText( $text ) {
-               wfDeprecated( __METHOD__, '1.32' );
-               $this->addWikiTextAsInterface( $text );
-       }
-
        /**
         * @param string $text
         * @since 1.32
@@ -285,7 +276,7 @@ class WebInstallerOutput {
 <?php echo Html::openElement( 'body', [ 'class' => $this->getLanguage()->getDir() ] ) . "\n"; ?>
 <div id="mw-page-base"></div>
 <div id="mw-head-base"></div>
-<div id="content" class="mw-body">
+<div id="content" class="mw-body" role="main">
 <div id="bodyContent" class="mw-body-content">
 
 <h1><?php $this->outputTitle(); ?></h1>
@@ -308,11 +299,27 @@ class WebInstallerOutput {
        </div>
 <?php
        $message = wfMessage( 'config-sidebar' )->plain();
+       // Section 1: External links
+       // @todo FIXME: Migrate to plain link label messages (T227297).
        foreach ( explode( '----', $message ) as $section ) {
                echo '<div class="portal"><div class="body">';
                echo $this->parent->parse( $section, true );
                echo '</div></div>';
        }
+       // Section 2: Installer pages
+       echo '<div class="portal"><div class="body"><ul>';
+       foreach ( [
+               'config-sidebar-readme' => 'Readme',
+               'config-sidebar-relnotes' => 'ReleaseNotes',
+               'config-sidebar-license' => 'Copying',
+               'config-sidebar-upgrade' => 'UpgradeDoc',
+       ] as $msgKey => $pageName ) {
+               echo $this->parent->makeLinkItem(
+                       $this->parent->getDocUrl( $pageName ),
+                       wfMessage( $msgKey )->text()
+               );
+       }
+       echo '</ul></div></div>';
 ?>
 </div>