Page MenuHomePhorge
Files F584948

No OneTemporary
Actions

Size
9 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 089e6623b3c..c2100b6d973 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -1389,7 +1389,7 @@ class HTMLForm extends ContextSource {
$attribs['class'] = [ 'mw-htmlform-submit' ];
- $buttons .= Xml::submitButton( $this->getSubmitText(), $attribs ) . "\n";
+ $buttons .= Html::submitButton( $this->getSubmitText(), $attribs ) . "\n";
}
if ( $this->mShowCancel ) {
diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index cb1d1cd04cb..dde6f0e9506 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -35,7 +35,6 @@ use MediaWiki\MediaWikiServices;
use MediaWiki\Message\Message;
use MediaWiki\Request\WebRequest;
use MediaWiki\Status\Status;
-use MediaWiki\Xml\Xml;
/**
* Class for the core installer web interface.
@@ -727,7 +726,7 @@ class WebInstaller extends Installer {
return "<div class=\"config-block\">\n" .
" <div class=\"config-block-label\">\n" .
- Xml::tags( 'label',
+ Html::rawElement( 'label',
$attributes,
$labelText
) . "\n" .
@@ -774,12 +773,13 @@ class WebInstaller extends Installer {
$params['label'],
$params['controlName'],
"<div class=\"cdx-text-input\">" .
- Xml::input(
+ Html::input(
$params['controlName'],
- 30, // intended to be overridden by CSS
$params['value'],
+ 'text',
$params['attribs'] + [
'id' => $params['controlName'],
+ 'size' => 30, // intended to be overridden by CSS
'class' => 'cdx-text-input__input',
'tabindex' => $this->nextTabIndex()
]
@@ -1032,7 +1032,7 @@ class WebInstaller extends Installer {
Html::radio( $params['controlName'], $checked, $itemAttribs + [ 'value' => $value ] ) .
'<span class="cdx-radio__icon"></span>' .
'<span class="cdx-radio__label cdx-label">' .
- Xml::tags(
+ Html::rawElement(
'label',
[ 'for' => $id, 'class' => 'cdx-label__label' ],
'<span class="cdx-label__label__text">' . $radioText . '</span>'
diff --git a/includes/specials/SpecialRecentChangesLinked.php b/includes/specials/SpecialRecentChangesLinked.php
index 0cb47f2d871..5a656930922 100644
--- a/includes/specials/SpecialRecentChangesLinked.php
+++ b/includes/specials/SpecialRecentChangesLinked.php
@@ -323,7 +323,7 @@ class SpecialRecentChangesLinked extends SpecialRecentChanges {
$opts->consumeValues( [ 'showlinkedto', 'target' ] );
$extraOpts['target'] = [ $this->msg( 'recentchangeslinked-page' )->escaped(),
- Xml::input( 'target', 40, str_replace( '_', ' ', $opts['target'] ) ) . ' ' .
+ Html::input( 'target', str_replace( '_', ' ', $opts['target'] ), 'text', [ 'size' => 40 ] ) . ' ' .
Html::check( 'showlinkedto', $opts['showlinkedto'], [ 'id' => 'showlinkedto' ] ) . ' ' .
Xml::label( $this->msg( 'recentchangeslinked-to' )->text(), 'showlinkedto' ) ];
diff --git a/includes/specials/SpecialRevisionDelete.php b/includes/specials/SpecialRevisionDelete.php
index 0dd4149efcd..e8fa800ae4f 100644
--- a/includes/specials/SpecialRevisionDelete.php
+++ b/includes/specials/SpecialRevisionDelete.php
@@ -36,7 +36,6 @@ use MediaWiki\SpecialPage\SpecialPage;
use MediaWiki\SpecialPage\UnlistedSpecialPage;
use MediaWiki\Status\Status;
use MediaWiki\Title\Title;
-use MediaWiki\Xml\Xml;
use RevDelList;
use RevisionDeleter;
@@ -376,7 +375,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
'token' => $user->getEditToken( $archiveName ),
] )
],
- Xml::submitButton( $this->msg( 'revdelete-show-file-submit' )->text() )
+ Html::submitButton( $this->msg( 'revdelete-show-file-submit' )->text() )
)
);
@@ -549,7 +548,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
[],
[ 'action' => 'edit' ]
);
- $htmlForm->setPostHtml( Xml::tags( 'p', [ 'class' => 'mw-revdel-editreasons' ], $link ) );
+ $htmlForm->setPostHtml( Html::rawElement( 'p', [ 'class' => 'mw-revdel-editreasons' ], $link ) );
}
$out->addHTML( $htmlForm->getHTML( false ) );
}
diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php
index 159f02d5f9c..ac4d206c9a2 100644
--- a/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@ -150,14 +150,14 @@ class SpecialTags extends SpecialPage {
}
// Write the headers
- $thead = Xml::tags( 'tr', null, Xml::tags( 'th', null, $this->msg( 'tags-tag' )->parse() ) .
- Xml::tags( 'th', null, $this->msg( 'tags-display-header' )->parse() ) .
- Xml::tags( 'th', null, $this->msg( 'tags-description-header' )->parse() ) .
- Xml::tags( 'th', null, $this->msg( 'tags-source-header' )->parse() ) .
- Xml::tags( 'th', null, $this->msg( 'tags-active-header' )->parse() ) .
- Xml::tags( 'th', null, $this->msg( 'tags-hitcount-header' )->parse() ) .
+ $thead = Html::rawElement( 'tr', [], Html::rawElement( 'th', [], $this->msg( 'tags-tag' )->parse() ) .
+ Html::rawElement( 'th', [], $this->msg( 'tags-display-header' )->parse() ) .
+ Html::rawElement( 'th', [], $this->msg( 'tags-description-header' )->parse() ) .
+ Html::rawElement( 'th', [], $this->msg( 'tags-source-header' )->parse() ) .
+ Html::rawElement( 'th', [], $this->msg( 'tags-active-header' )->parse() ) .
+ Html::rawElement( 'th', [], $this->msg( 'tags-hitcount-header' )->parse() ) .
( ( $userCanManage || $userCanDelete ) ?
- Xml::tags( 'th', [ 'class' => 'unsortable' ],
+ Html::rawElement( 'th', [ 'class' => 'unsortable' ],
$this->msg( 'tags-actions-header' )->parse() ) :
'' )
);
@@ -184,11 +184,11 @@ class SpecialTags extends SpecialPage {
'mediawiki.pager.styles'
] );
$out->addModules( 'jquery.tablesorter' );
- $out->addHTML( Xml::tags(
+ $out->addHTML( Html::rawElement(
'table',
[ 'class' => 'mw-datatable sortable mw-tags-table' ],
- Xml::tags( 'thead', null, $thead ) .
- Xml::tags( 'tbody', null, $tbody )
+ Html::rawElement( 'thead', [], $thead ) .
+ Html::rawElement( 'tbody', [], $tbody )
) );
}
@@ -196,12 +196,12 @@ class SpecialTags extends SpecialPage {
string $tag, int $hitcount, bool $showManageActions, bool $showDeleteActions, bool $showEditLinks
): string {
$newRow = '';
- $newRow .= Xml::tags( 'td', null, Xml::element( 'code', null, $tag ) );
+ $newRow .= Html::rawElement( 'td', [], Xml::element( 'code', [], $tag ) );
$linkRenderer = $this->getLinkRenderer();
$disp = ChangeTags::tagDescription( $tag, $this->getContext() );
if ( $disp === false ) {
- $disp = Xml::element( 'em', null, $this->msg( 'tags-hidden' )->text() );
+ $disp = Xml::element( 'em', [], $this->msg( 'tags-hidden' )->text() );
}
if ( $showEditLinks ) {
$disp .= ' ';
@@ -221,7 +221,7 @@ class SpecialTags extends SpecialPage {
$this->getLanguage()->pipeList( [ $editLink, $helpEditLink ] )
)->escaped();
}
- $newRow .= Xml::tags( 'td', null, $disp );
+ $newRow .= Html::rawElement( 'td', [], $disp );
$msg = $this->msg( "tag-$tag-description" );
$desc = !$msg->exists() ? '' : $msg->parse();
@@ -235,7 +235,7 @@ class SpecialTags extends SpecialPage {
);
$desc .= $this->msg( 'parentheses' )->rawParams( $editDescLink )->escaped();
}
- $newRow .= Xml::tags( 'td', null, $desc );
+ $newRow .= Html::rawElement( 'td', [], $desc );
$sourceMsgs = [];
$isSoftware = isset( $this->softwareDefinedTags[$tag] );
@@ -250,11 +250,11 @@ class SpecialTags extends SpecialPage {
if ( !$sourceMsgs ) {
$sourceMsgs[] = $this->msg( 'tags-source-none' )->escaped();
}
- $newRow .= Xml::tags( 'td', null, implode( Xml::element( 'br' ), $sourceMsgs ) );
+ $newRow .= Html::rawElement( 'td', [], implode( Xml::element( 'br' ), $sourceMsgs ) );
$isActive = $isExplicit || isset( $this->softwareActivatedTags[$tag] );
$activeMsg = ( $isActive ? 'tags-active-yes' : 'tags-active-no' );
- $newRow .= Xml::tags( 'td', null, $this->msg( $activeMsg )->escaped() );
+ $newRow .= Html::rawElement( 'td', [], $this->msg( $activeMsg )->escaped() );
$hitcountLabelMsg = $this->msg( 'tags-hitcount' )->numParams( $hitcount );
if ( $this->getConfig()->get( MainConfigNames::UseTagFilter ) ) {
@@ -269,7 +269,7 @@ class SpecialTags extends SpecialPage {
}
// add raw $hitcount for sorting, because tags-hitcount contains numbers and letters
- $newRow .= Xml::tags( 'td', [ 'data-sort-value' => $hitcount ], $hitcountLabel );
+ $newRow .= Html::rawElement( 'td', [ 'data-sort-value' => $hitcount ], $hitcountLabel );
$actionLinks = [];
@@ -300,10 +300,10 @@ class SpecialTags extends SpecialPage {
}
if ( $showDeleteActions || $showManageActions ) {
- $newRow .= Xml::tags( 'td', null, $this->getLanguage()->pipeList( $actionLinks ) );
+ $newRow .= Html::rawElement( 'td', [], $this->getLanguage()->pipeList( $actionLinks ) );
}
- return Xml::tags( 'tr', null, $newRow ) . "\n";
+ return Html::rawElement( 'tr', [], $newRow ) . "\n";
}
public function processCreateTagForm( array $data, HTMLForm $form ) {
diff --git a/includes/specials/SpecialWhatLinksHere.php b/includes/specials/SpecialWhatLinksHere.php
index 0533526107d..ecdcfaf78eb 100644
--- a/includes/specials/SpecialWhatLinksHere.php
+++ b/includes/specials/SpecialWhatLinksHere.php
@@ -550,7 +550,7 @@ class SpecialWhatLinksHere extends FormSpecialPage {
return $notClose ?
Xml::openElement( 'li' ) . "$link $propsText $wlh\n" :
- Xml::tags( 'li', null, "$link $propsText $wlh" ) . "\n";
+ Html::rawElement( 'li', [], "$link $propsText $wlh" ) . "\n";
}
protected function listEnd() {

File Metadata

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

Event Timeline