From 2c965c5dc4938461afaa8d6686cb7d6d6d6a0984 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Thu, 4 Nov 2010 23:23:34 +0000 Subject: [PATCH] Followup r76055, missed a few more --- includes/installer/DatabaseInstaller.php | 2 +- includes/installer/OracleInstaller.php | 6 +++--- includes/installer/WebInstaller.php | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php index d05b450509..00c44565d9 100644 --- a/includes/installer/DatabaseInstaller.php +++ b/includes/installer/DatabaseInstaller.php @@ -395,7 +395,7 @@ abstract class DatabaseInstaller { */ public function getWebUserBox( $noCreateMsg = false ) { $name = $this->getName(); - $s = Xml::openElement( 'fieldset' ) . + $s = Html::openElement( 'fieldset' ) . Html::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) . $this->getCheckBox( '_SameAccount', 'config-db-web-account-same', diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php index 62b3ad2cbd..8dbc7ad3e5 100644 --- a/includes/installer/OracleInstaller.php +++ b/includes/installer/OracleInstaller.php @@ -57,12 +57,12 @@ class OracleInstaller extends DatabaseInstaller { $this->parent->setVar( 'wgDBserver', '' ); return $this->getTextBox( 'wgDBserver', 'config-db-host-oracle', array(), $this->parent->getHelpBox( 'config-db-host-oracle-help' ) ) . - Xml::openElement( 'fieldset' ) . - Xml::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) . + Html::openElement( 'fieldset' ) . + Html::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) . $this->getTextBox( 'wgDBprefix', 'config-db-prefix' ) . $this->getTextBox( '_OracleDefTS', 'config-oracle-def-ts' ) . $this->getTextBox( '_OracleTempTS', 'config-oracle-temp-ts', array(), $this->parent->getHelpBox( 'config-db-oracle-help' ) ) . - Xml::closeElement( 'fieldset' ) . + Html::closeElement( 'fieldset' ) . $this->getInstallUserBox(). $this->getWebUserBox(); } diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php index 5921e52d6c..f016775d08 100644 --- a/includes/installer/WebInstaller.php +++ b/includes/installer/WebInstaller.php @@ -486,7 +486,7 @@ class WebInstaller extends CoreInstaller { $s .= "\n". // end list pane "
\n" . - Xml::element( 'h2', array(), + Html::element( 'h2', array(), wfMsg( 'config-page-' . strtolower( $currentPageName ) ) ); $this->output->addHTMLNoFlush( $s ); @@ -513,7 +513,7 @@ class WebInstaller extends CoreInstaller { $query['lastPage'] = $currentPageName; } - $link = Xml::element( 'a', + $link = Html::element( 'a', array( 'href' => $this->getUrl( $query ) ), @@ -529,7 +529,7 @@ class WebInstaller extends CoreInstaller { $s .= $link; } } else { - $s .= Xml::element( 'span', + $s .= Html::element( 'span', array( 'class' => 'config-page-disabled' ), @@ -581,7 +581,7 @@ class WebInstaller extends CoreInstaller { $s = "
\n" . "
\n" . - Xml::element( 'img', + Html::element( 'img', array( 'src' => '../skins/common/images/' . $icon, 'alt' => wfMsg( 'config-information' ), -- 2.20.1