Merge "API: Always select rc_user from database (regardless of rcprop=user)"

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

diff --git a/includes/installer/WebInstallerDBConnect.php b/includes/installer/WebInstallerDBConnect.php
index 7a0825e..3bacb76 100644 (file)
--- a/includes/installer/WebInstallerDBConnect.php
+++ b/includes/installer/WebInstallerDBConnect.php
@@ -48,14 +48,13 @@ class WebInstallerDBConnect extends WebInstallerPage {
                $settings = '';
                $defaultType = $this->getVar( 'wgDBtype' );
 
-               // Messages: config-dbsupport-mysql, config-dbsupport-postgres, config-dbsupport-oracle,
-               // config-dbsupport-sqlite, config-dbsupport-mssql
+               // Messages: config-dbsupport-mysql, config-dbsupport-postgres, config-dbsupport-sqlite
                $dbSupport = '';
                foreach ( Installer::getDBTypes() as $type ) {
                        $dbSupport .= wfMessage( "config-dbsupport-$type" )->plain() . "\n";
                }
                $this->addHTML( $this->parent->getInfoBox(
-                       wfMessage( 'config-support-info', trim( $dbSupport ) )->text() ) );
+                       wfMessage( 'config-support-info', trim( $dbSupport ) )->plain() ) );
 
                // It's possible that the library for the default DB type is not compiled in.
                // In that case, instead select the first supported DB type in the list.
@@ -74,20 +73,19 @@ class WebInstallerDBConnect extends WebInstallerPage {
                                        $type,
                                        "DBType_$type",
                                        $type == $defaultType,
-                                       array( 'class' => 'dbRadio', 'rel' => "DB_wrapper_$type" )
+                                       [ 'class' => 'dbRadio', 'rel' => "DB_wrapper_$type" ]
                                ) .
                                "</li>\n";
 
-                       // Messages: config-header-mysql, config-header-postgres, config-header-oracle,
-                       // config-header-sqlite
+                       // Messages: config-header-mysql, config-header-postgres, config-header-sqlite
                        $settings .= Html::openElement(
                                        'div',
-                                       array(
+                                       [
                                                'id' => 'DB_wrapper_' . $type,
                                                'class' => 'dbWrapper'
-                                       )
+                                       ]
                                ) .
-                               Html::element( 'h3', array(), wfMessage( 'config-header-' . $type )->text() ) .
+                               Html::element( 'h3', [], wfMessage( 'config-header-' . $type )->text() ) .
                                $installer->getConnectForm() .
                                "</div>\n";
                }