Merge "maintenance: Script to rename titles for Unicode uppercasing changes"

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

diff --git a/includes/installer/WebInstallerName.php b/includes/installer/WebInstallerName.php
index 8314fd2..981e3a8 100644 (file)
--- a/includes/installer/WebInstallerName.php
+++ b/includes/installer/WebInstallerName.php
@@ -28,10 +28,8 @@ class WebInstallerName extends WebInstallerPage {
         */
        public function execute() {
                $r = $this->parent->request;
-               if ( $r->wasPosted() ) {
-                       if ( $this->submit() ) {
-                               return 'continue';
-                       }
+               if ( $r->wasPosted() && $this->submit() ) {
+                       return 'continue';
                }
 
                $this->startForm();
@@ -117,7 +115,7 @@ class WebInstallerName extends WebInstallerPage {
                                'value' => true,
                        ] ) .
                        $this->getFieldsetEnd() .
-                       $this->parent->getInfoBox( wfMessage( 'config-almost-done' )->text() ) .
+                       $this->parent->getInfoBox( wfMessage( 'config-almost-done' )->plain() ) .
                        // getRadioSet() builds a set of labeled radio buttons.
                        // For grep: The following messages are used as the item labels:
                        // config-optional-continue, config-optional-skip