installer: Convert <downloadlink/> hack to raw message param

Bug: T227297
Change-Id: I9a50342aa0c9525893085e1b8d428556f0262f5c

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index b09455e..82c1a69 100644 (file)
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -148,7 +148,6 @@ class WebInstaller extends Installer {
 
                // Add parser hooks
                $parser = MediaWikiServices::getInstance()->getParser();
-               $parser->setHook( 'downloadlink', [ $this, 'downloadLinkHook' ] );
                $parser->setHook( 'doclink', [ $this, 'docLink' ] );
        }
 
@@ -660,13 +659,15 @@ class WebInstaller extends Installer {
        /**
         * Get HTML for an information message box with an icon.
         *
-        * @param string $text Wikitext to be parsed (from Message::plain).
+        * @param string|HtmlArmor $text Wikitext to be parsed (from Message::plain) or raw HTML.
         * @param string|bool $icon Icon name, file in mw-config/images. Default: false
         * @param string|bool $class Additional class name to add to the wrapper div. Default: false.
         * @return string HTML
         */
        public function getInfoBox( $text, $icon = false, $class = false ) {
-               $html = $this->parse( $text, true );
+               $html = ( $text instanceof HtmlArmor ) ?
+                       HtmlArmor::getHtml( $text ) :
+                       $this->parse( $text, true );
                $icon = ( $icon == false ) ?
                        'images/info-32.png' :
                        'images/' . $icon;
@@ -1121,15 +1122,12 @@ class WebInstaller extends Installer {
        }
 
        /**
-        * Helper for "Download LocalSettings" link on WebInstall_Complete
-        *
-        * @param string $text Unused
-        * @param string[] $attribs Unused
-        * @param Parser $parser Unused
+        * Helper for "Download LocalSettings" link.
         *
+        * @internal For use in WebInstallerComplete class
         * @return string Html for download link
         */
-       public function downloadLinkHook( $text, $attribs, $parser ) {
+       public function makeDownloadLinkHtml() {
                $anchor = Html::rawElement( 'a',
                        [ 'href' => $this->getUrl( [ 'localsettings' => 1 ] ) ],
                        wfMessage( 'config-download-localsettings' )->parse()

diff --git a/includes/installer/WebInstallerComplete.php b/includes/installer/WebInstallerComplete.php
index 685fa36..2512efa 100644 (file)
--- a/includes/installer/WebInstallerComplete.php
+++ b/includes/installer/WebInstallerComplete.php
@@ -45,13 +45,13 @@ class WebInstallerComplete extends WebInstallerPage {
                }
                $this->addHTML(
                        $this->parent->getInfoBox(
-                               wfMessage( $msg,
+                               new HtmlArmor( wfMessage( $msg,
                                        $lsUrl,
                                        $this->getVar( 'wgServer' ) .
                                                $this->getVar( 'wgScriptPath' ) . '/index.php',
-                                       '<downloadlink/>',
+                                       Message::rawParam( $this->parent->makeDownloadLinkHtml() ),
                                        $location ?: ''
-                               )->plain(), 'tick-32.png'
+                               )->parse() ), 'tick-32.png'
                        )
                );
                $this->addHTML( $this->parent->getInfoBox(