Page MenuHomePhorge
Files F585041

No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index c2100b6d973..6841751329e 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -77,7 +77,6 @@ use MediaWiki\Session\CsrfTokenSet;
use MediaWiki\Status\Status;
use MediaWiki\Title\Title;
use MediaWiki\Title\TitleValue;
-use MediaWiki\Xml\Xml;
use StatusValue;
use Stringable;
use Wikimedia\Message\MessageParam;
@@ -1322,7 +1321,11 @@ class HTMLForm extends ContextSource {
# Include a <fieldset> wrapper for style, if requested.
if ( $this->mWrapperLegend !== false ) {
$legend = is_string( $this->mWrapperLegend ) ? $this->mWrapperLegend : false;
- $html = Xml::fieldset( $legend, $html, $this->mWrapperAttributes );
+ $html = Html::rawElement(
+ 'fieldset',
+ $this->mWrapperAttributes,
+ ( $legend ? Html::element( 'legend', [], $legend ) : '' ) . $html
+ );
}
return Html::rawElement(
@@ -1832,7 +1835,11 @@ class HTMLForm extends ContextSource {
* @return string The fieldset's Html
*/
protected function wrapFieldSetSection( $legend, $section, $attributes, $isRoot ) {
- return Xml::fieldset( $legend, $section, $attributes ) . "\n";
+ return Html::rawElement(
+ 'fieldset',
+ $attributes,
+ Html::element( 'legend', [], $legend ) . $section
+ ) . "\n";
}
/**
diff --git a/includes/htmlform/fields/HTMLFormFieldCloner.php b/includes/htmlform/fields/HTMLFormFieldCloner.php
index 4f84a7911a4..07e833886fb 100644
--- a/includes/htmlform/fields/HTMLFormFieldCloner.php
+++ b/includes/htmlform/fields/HTMLFormFieldCloner.php
@@ -8,7 +8,6 @@ use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\Parser\Sanitizer;
use MediaWiki\Request\DerivativeRequest;
-use MediaWiki\Xml\Xml;
/**
* A container for HTMLFormFields that allows for multiple copies of the set of
@@ -440,7 +439,11 @@ class HTMLFormFieldCloner extends HTMLFormField {
if ( !empty( $this->mParams['row-legend'] ) ) {
$legend = $this->msg( $this->mParams['row-legend'] )->text();
- $html = Xml::fieldset( $legend, $html );
+ $html = Html::rawElement(
+ 'fieldset',
+ [],
+ $legend ? Html::element( 'legend', [], $legend ) : '' . $html
+ );
}
return $html;
@@ -545,7 +548,11 @@ class HTMLFormFieldCloner extends HTMLFormField {
if ( !empty( $this->mParams['row-legend'] ) ) {
$legend = $this->msg( $this->mParams['row-legend'] )->text();
- $html = Xml::fieldset( $legend, $html );
+ $html = Html::rawElement(
+ 'fieldset',
+ [],
+ $legend ? Html::element( 'legend', [], $legend ) : '' . $html
+ );
}
return $html;
diff --git a/includes/specials/SpecialEditTags.php b/includes/specials/SpecialEditTags.php
index f9bc8bae911..06b8e8a3aaf 100644
--- a/includes/specials/SpecialEditTags.php
+++ b/includes/specials/SpecialEditTags.php
@@ -33,7 +33,6 @@ use MediaWiki\SpecialPage\SpecialPage;
use MediaWiki\SpecialPage\UnlistedSpecialPage;
use MediaWiki\Status\Status;
use MediaWiki\Title\Title;
-use MediaWiki\Xml\Xml;
use MediaWiki\Xml\XmlSelect;
use RevisionDeleter;
@@ -277,8 +276,11 @@ class SpecialEditTags extends UnlistedSpecialPage {
$form = Html::openElement( 'form', [ 'method' => 'post',
'action' => $this->getPageTitle()->getLocalURL( [ 'action' => 'submit' ] ),
'id' => 'mw-revdel-form-revisions' ] ) .
- Xml::fieldset( $this->msg( "tags-edit-{$this->typeName}-legend",
- count( $this->ids ) )->text() ) .
+ Html::openElement( 'fieldset' ) .
+ Html::element(
+ 'legend', [],
+ $this->msg( "tags-edit-{$this->typeName}-legend", count( $this->ids ) )->text()
+ ) .
$this->buildCheckBoxes() .
Html::openElement( 'table' ) .
"<tr>\n" .
diff --git a/includes/specials/SpecialRecentChanges.php b/includes/specials/SpecialRecentChanges.php
index 67904b4c73d..b2aeae3ee79 100644
--- a/includes/specials/SpecialRecentChanges.php
+++ b/includes/specials/SpecialRecentChanges.php
@@ -39,7 +39,6 @@ use MediaWiki\User\TempUser\TempUserConfig;
use MediaWiki\User\UserIdentityUtils;
use MediaWiki\Utils\MWTimestamp;
use MediaWiki\Watchlist\WatchedItemStoreInterface;
-use MediaWiki\Xml\Xml;
use OOUI\ButtonWidget;
use OOUI\HtmlSnippet;
use Wikimedia\HtmlArmor\HtmlArmor;
@@ -672,10 +671,13 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
$panel[] = $form;
$panelString = implode( "\n", $panel );
- $rcoptions = Xml::fieldset(
- $this->msg( 'recentchanges-legend' )->text(),
- $panelString,
- [ 'class' => 'rcoptions cloptions' ]
+ $rcoptions = Html::rawElement(
+ 'fieldset',
+ [ 'class' => 'rcoptions cloptions' ],
+ Html::element(
+ 'legend', [],
+ $this->msg( 'recentchanges-legend' )->text()
+ ) . $panelString
);
// Insert a placeholder for RCFilters

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jul 5, 5:31 AM (13 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
227489
Default Alt Text
(4 KB)

Event Timeline