Merge "Installer: output css correctly when session errors occur"

diff --combined includes/installer/WebInstaller.php
index c07fc3a,34d919d..66e8bd9
--- 1/includes/installer/WebInstaller.php
--- 2/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@@ -61,7 -61,7 +61,7 @@@ class WebInstaller extends Installer 
         * To add a new installer page:
         *    * Add it to this WebInstaller::$pageSequence property
         *    * Add a "config-page-<name>" message
 -       *    * Add a "WebInstaller_<name>" class
 +       *    * Add a "WebInstaller<name>" class
         *
         * @var string[]
         */
@@@ -182,10 -182,7 +182,7 @@@
  
                $cssDir = $this->request->getVal( 'css' );
                if ( $cssDir ) {
-                       $cssDir = ( $cssDir == 'rtl' ? 'rtl' : 'ltr' );
-                       $this->request->response()->header( 'Content-type: text/css' );
-                       echo $this->output->getCSS( $cssDir );
- 
+                       $this->outputCss( $cssDir );
                        return $this->session;
                }
  
@@@ -354,8 -351,6 +351,6 @@@
                restore_error_handler();
  
                if ( $this->phpErrors ) {
-                       $this->showError( 'config-session-error', $this->phpErrors[0] );
- 
                        return false;
                }
  
@@@ -462,7 -457,7 +457,7 @@@
         * @return WebInstallerPage
         */
        public function getPageByName( $pageName ) {
 -              $pageClass = 'WebInstaller_' . $pageName;
 +              $pageClass = 'WebInstaller' . $pageName;
  
                return new $pageClass( $this );
        }
@@@ -702,9 -697,8 +697,9 @@@
                $html = $this->parse( $text, true );
  
                return "<div class=\"mw-help-field-container\">\n" .
 -                      "<span class=\"mw-help-field-hint\">" . wfMessage( 'config-help' )->escaped() .
 -                      "</span>\n" .
 +                      "<span class=\"mw-help-field-hint\" title=\"" .
 +                      wfMessage( 'config-help-tooltip' )->escaped() . "\">" .
 +                      wfMessage( 'config-help' )->escaped() . "</span>\n" .
                        "<span class=\"mw-help-field-data\">" . $html . "</span>\n" .
                        "</div>\n";
        }
@@@ -1118,10 -1112,14 +1113,10 @@@
         * @return string Html for download link
         */
        public function downloadLinkHook( $text, $attribs, $parser ) {
 -              $img = Html::element( 'img', array(
 -                      'src' => '../skins/common/images/download-32.png',
 -                      'width' => '32',
 -                      'height' => '32',
 -              ) );
                $anchor = Html::rawElement( 'a',
                        array( 'href' => $this->getURL( array( 'localsettings' => 1 ) ) ),
 -                      $img . ' ' . wfMessage( 'config-download-localsettings' )->parse() );
 +                      wfMessage( 'config-download-localsettings' )->parse()
 +              );
  
                return Html::rawElement( 'div', array( 'class' => 'config-download-link' ), $anchor );
        }
@@@ -1158,4 -1156,20 +1153,20 @@@
                return WebRequest::detectServer();
        }
  
+       /**
+        * @param string $dir CSS direction ( rtl or ltr )
+        */
+       public function outputCss( $dir ) {
+               $dir = ( $dir == 'rtl' ? 'rtl' : 'ltr' );
+               $this->request->response()->header( 'Content-type: text/css' );
+               echo $this->output->getCSS( $dir );
+       }
+ 
+       /**
+        * @return string[]
+        */
+       public function getPhpErrors() {
+               return $this->phpErrors;
+       }
+ 
  }