Page MenuHomePhorge
Files F584934

No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/includes/htmlform/fields/HTMLRadioField.php b/includes/htmlform/fields/HTMLRadioField.php
index cbe96d6ddcf..f971e94cd45 100644
--- a/includes/htmlform/fields/HTMLRadioField.php
+++ b/includes/htmlform/fields/HTMLRadioField.php
@@ -6,7 +6,6 @@ use InvalidArgumentException;
use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLFormField;
use MediaWiki\Parser\Sanitizer;
-use MediaWiki\Xml\Xml;
/**
* Radio checkbox fields.
@@ -200,9 +199,12 @@ class HTMLRadioField extends HTMLFormField {
} else {
$id = Sanitizer::escapeIdForAttribute( $this->mID . "-$info" );
$classes = [ 'mw-htmlform-flatlist-item' ];
- $radio = Xml::radio(
- $this->mName, $info, $info === $value, $attribs + [ 'id' => $id ]
+ $radio = Html::radio(
+ $this->mName,
+ $info === $value,
+ $attribs + [ 'value' => $info, 'id' => $id ]
);
+
$radio .= "\u{00A0}" .
Html::rawElement( 'label', [ 'for' => $id ], $this->escapeLabel( $label ) );
diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index 24fd06857a2..25663d790d8 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -1029,7 +1029,7 @@ class WebInstaller extends Installer {
$items[$value] =
'<span class="cdx-radio">' .
'<span class="cdx-radio__wrapper">' .
- Xml::radio( $params['controlName'], $value, $checked, $itemAttribs ) .
+ Html::radio( $params['controlName'], $checked, $itemAttribs + [ 'value' => $value ] ) .
'<span class="cdx-radio__icon"></span>' .
'<span class="cdx-radio__label cdx-label">' .
Xml::tags(
diff --git a/includes/specials/pagers/MergeHistoryPager.php b/includes/specials/pagers/MergeHistoryPager.php
index 856689f819f..b344aa664ae 100644
--- a/includes/specials/pagers/MergeHistoryPager.php
+++ b/includes/specials/pagers/MergeHistoryPager.php
@@ -33,7 +33,6 @@ use MediaWiki\Page\PageIdentity;
use MediaWiki\Revision\RevisionRecord;
use MediaWiki\Revision\RevisionStore;
use MediaWiki\User\UserIdentityValue;
-use MediaWiki\Xml\Xml;
use Wikimedia\Rdbms\IConnectionProvider;
/**
@@ -148,9 +147,10 @@ class MergeHistoryPager extends ReverseChronologicalPager {
$ts = wfTimestamp( TS_MW, $row->rev_timestamp );
$tsWithId = $ts . "|" . $row->rev_id;
- $checkBox = Xml::radio(
- 'mergepoint', $tsWithId,
- $this->mergePointTimestamp === $ts || $this->mergePointTimestamp === $tsWithId
+ $checkBox = Html::radio(
+ 'mergepoint',
+ $this->mergePointTimestamp === $ts || $this->mergePointTimestamp === $tsWithId,
+ [ 'value' => $tsWithId ]
);
$user = $this->getUser();

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jul 5, 5:31 AM (8 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
227417
Default Alt Text
(2 KB)

Event Timeline