| Index: trunk/phase3/includes/installer/WebInstaller.php |
| — | — | @@ -486,7 +486,7 @@ |
| 487 | 487 | |
| 488 | 488 | $s .= "</ul></div>\n". // end list pane |
| 489 | 489 | "<div class=\"config-page\">\n" . |
| 490 | | - Xml::element( 'h2', array(), |
| | 490 | + Html::element( 'h2', array(), |
| 491 | 491 | wfMsg( 'config-page-' . strtolower( $currentPageName ) ) ); |
| 492 | 492 | |
| 493 | 493 | $this->output->addHTMLNoFlush( $s ); |
| — | — | @@ -513,7 +513,7 @@ |
| 514 | 514 | $query['lastPage'] = $currentPageName; |
| 515 | 515 | } |
| 516 | 516 | |
| 517 | | - $link = Xml::element( 'a', |
| | 517 | + $link = Html::element( 'a', |
| 518 | 518 | array( |
| 519 | 519 | 'href' => $this->getUrl( $query ) |
| 520 | 520 | ), |
| — | — | @@ -529,7 +529,7 @@ |
| 530 | 530 | $s .= $link; |
| 531 | 531 | } |
| 532 | 532 | } else { |
| 533 | | - $s .= Xml::element( 'span', |
| | 533 | + $s .= Html::element( 'span', |
| 534 | 534 | array( |
| 535 | 535 | 'class' => 'config-page-disabled' |
| 536 | 536 | ), |
| — | — | @@ -581,7 +581,7 @@ |
| 582 | 582 | $s = |
| 583 | 583 | "<div class=\"config-info $class\">\n" . |
| 584 | 584 | "<div class=\"config-info-left\">\n" . |
| 585 | | - Xml::element( 'img', |
| | 585 | + Html::element( 'img', |
| 586 | 586 | array( |
| 587 | 587 | 'src' => '../skins/common/images/' . $icon, |
| 588 | 588 | 'alt' => wfMsg( 'config-information' ), |
| Index: trunk/phase3/includes/installer/DatabaseInstaller.php |
| — | — | @@ -395,7 +395,7 @@ |
| 396 | 396 | */ |
| 397 | 397 | public function getWebUserBox( $noCreateMsg = false ) { |
| 398 | 398 | $name = $this->getName(); |
| 399 | | - $s = Xml::openElement( 'fieldset' ) . |
| | 399 | + $s = Html::openElement( 'fieldset' ) . |
| 400 | 400 | Html::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) . |
| 401 | 401 | $this->getCheckBox( |
| 402 | 402 | '_SameAccount', 'config-db-web-account-same', |
| Index: trunk/phase3/includes/installer/OracleInstaller.php |
| — | — | @@ -57,12 +57,12 @@ |
| 58 | 58 | $this->parent->setVar( 'wgDBserver', '' ); |
| 59 | 59 | return |
| 60 | 60 | $this->getTextBox( 'wgDBserver', 'config-db-host-oracle', array(), $this->parent->getHelpBox( 'config-db-host-oracle-help' ) ) . |
| 61 | | - Xml::openElement( 'fieldset' ) . |
| 62 | | - Xml::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) . |
| | 61 | + Html::openElement( 'fieldset' ) . |
| | 62 | + Html::element( 'legend', array(), wfMsg( 'config-db-wiki-settings' ) ) . |
| 63 | 63 | $this->getTextBox( 'wgDBprefix', 'config-db-prefix' ) . |
| 64 | 64 | $this->getTextBox( '_OracleDefTS', 'config-oracle-def-ts' ) . |
| 65 | 65 | $this->getTextBox( '_OracleTempTS', 'config-oracle-temp-ts', array(), $this->parent->getHelpBox( 'config-db-oracle-help' ) ) . |
| 66 | | - Xml::closeElement( 'fieldset' ) . |
| | 66 | + Html::closeElement( 'fieldset' ) . |
| 67 | 67 | $this->getInstallUserBox(). |
| 68 | 68 | $this->getWebUserBox(); |
| 69 | 69 | } |