Remove most named character references from output

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

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index 4ba47ba..44c5b52 100644 (file)
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -550,7 +550,7 @@ class WebInstaller extends Installer {
         */
        function label( $msg, $forId, $contents ) {
                if ( strval( $msg ) == '' ) {
-                       $labelText = ' ';
+                       $labelText = ' ';
                } else {
                        $labelText = wfMsgHtml( $msg );
                }
@@ -717,7 +717,7 @@ class WebInstaller extends Installer {
                        $s .=
                                '<li>' .
                                Xml::radio( $params['controlName'], $value, $checked, $itemAttribs ) .
-                               '&nbsp;' .
+                               '&#160;' .
                                Xml::tags( 'label', array( 'for' => $id ), $this->parse(
                                        wfMsgNoTrans( $params['itemLabelPrefix'] . strtolower( $value ) )
                                ) ) .
@@ -1430,11 +1430,12 @@ class WebInstaller_Options extends WebInstallerPage {
                                'value' => $selected,
                        ) ) .
                        $this->parent->getHelpBox( 'config-cache-help' ) .
+                       '<div id="config-memcachewrapper">' .
                        $this->parent->getTextBox( array(
                                'var' => '_MemCachedServers',
                                'label' => 'config-memcached-servers',
                        ) ) .
-                       $this->parent->getHelpBox( 'config-memcached-help' ) .
+                       $this->parent->getHelpBox( 'config-memcached-help' ) . '</div>' .
                        $this->parent->getFieldsetEnd()
                );
                $this->endForm();
@@ -1491,7 +1492,7 @@ class WebInstaller_Options extends WebInstallerPage {
                return
                        '<p>'.
                        Xml::element( 'img', array( 'src' => $this->getVar( 'wgRightsIcon' ) ) ) .
-                       '&nbsp;&nbsp;' .
+                       '&#160;&#160;' .
                        htmlspecialchars( $this->getVar( 'wgRightsText' ) ) .
                        "</p>\n" .
                        "<p style=\"text-align: center\">" .
@@ -1724,6 +1725,6 @@ class WebInstaller_Copying extends WebInstaller_Document {
        }
 
        private static function replaceLeadingSpaces( $matches ) {
-               return "\n" . str_repeat( '&nbsp;', strlen( $matches[0] ) );
+               return "\n" . str_repeat( '&#160;', strlen( $matches[0] ) );
        }
 }