Page MenuHomePhorge
Files F585045

No OneTemporary
Actions

Size
8 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/includes/specialpage/QueryPage.php b/includes/specialpage/QueryPage.php
index f283a71a0b3..6463000f308 100644
--- a/includes/specialpage/QueryPage.php
+++ b/includes/specialpage/QueryPage.php
@@ -27,6 +27,7 @@ use Exception;
use MediaWiki\Cache\LinkBatchFactory;
use MediaWiki\Config\Config;
use MediaWiki\HookContainer\HookRunner;
+use MediaWiki\Html\Html;
use MediaWiki\Linker\LinkTarget;
use MediaWiki\MainConfigNames;
use MediaWiki\MediaWikiServices;
@@ -65,7 +66,6 @@ use MediaWiki\Specials\SpecialWantedFiles;
use MediaWiki\Specials\SpecialWantedPages;
use MediaWiki\Specials\SpecialWantedTemplates;
use MediaWiki\Specials\SpecialWithoutInterwiki;
-use MediaWiki\Xml\Xml;
use stdClass;
use Wikimedia\Rdbms\DBError;
use Wikimedia\Rdbms\IConnectionProvider;
@@ -780,7 +780,7 @@ abstract class QueryPage extends SpecialPage {
$dbr = $this->getRecacheDB();
$this->preprocessResults( $dbr, $res );
- $out->addHTML( Xml::openElement( 'div', [ 'class' => 'mw-spcontent' ] ) );
+ $out->addHTML( Html::openElement( 'div', [ 'class' => 'mw-spcontent' ] ) );
// Top header and navigation
if ( $this->shownavigation ) {
@@ -800,7 +800,7 @@ abstract class QueryPage extends SpecialPage {
// No results to show, so don't bother with "showing X of Y" etc.
// -- just let the user know and give up now
$this->showEmptyText();
- $out->addHTML( Xml::closeElement( 'div' ) );
+ $out->addHTML( Html::closeElement( 'div' ) );
return;
}
}
@@ -821,7 +821,7 @@ abstract class QueryPage extends SpecialPage {
$out->addHTML( '<p>' . $paging . '</p>' );
}
- $out->addHTML( Xml::closeElement( 'div' ) );
+ $out->addHTML( Html::closeElement( 'div' ) );
}
/**
diff --git a/includes/specials/SpecialChangeContentModel.php b/includes/specials/SpecialChangeContentModel.php
index 505c4f00460..41b25bbedbe 100644
--- a/includes/specials/SpecialChangeContentModel.php
+++ b/includes/specials/SpecialChangeContentModel.php
@@ -8,6 +8,7 @@ use MediaWiki\Content\ContentHandler;
use MediaWiki\Content\IContentHandlerFactory;
use MediaWiki\EditPage\SpamChecker;
use MediaWiki\Exception\ErrorPageError;
+use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\Language\RawMessage;
use MediaWiki\Logging\LogEventsList;
@@ -20,7 +21,6 @@ use MediaWiki\Revision\SlotRecord;
use MediaWiki\SpecialPage\FormSpecialPage;
use MediaWiki\Status\Status;
use MediaWiki\Title\Title;
-use MediaWiki\Xml\Xml;
use SearchEngineFactory;
/**
@@ -87,7 +87,7 @@ class SpecialChangeContentModel extends FormSpecialPage {
$text = '';
if ( $this->title ) {
$contentModelLogPage = new LogPage( 'contentmodel' );
- $text = Xml::element( 'h2', null, $contentModelLogPage->getName()->text() );
+ $text = Html::element( 'h2', [], $contentModelLogPage->getName()->text() );
$out = '';
LogEventsList::showLogExtract( $out, 'contentmodel', $this->title );
$text .= $out;
diff --git a/includes/specials/SpecialRecentChangesLinked.php b/includes/specials/SpecialRecentChangesLinked.php
index 5a656930922..1bd936a60cc 100644
--- a/includes/specials/SpecialRecentChangesLinked.php
+++ b/includes/specials/SpecialRecentChangesLinked.php
@@ -31,7 +31,6 @@ use MediaWiki\User\Options\UserOptionsLookup;
use MediaWiki\User\TempUser\TempUserConfig;
use MediaWiki\User\UserIdentityUtils;
use MediaWiki\Watchlist\WatchedItemStoreInterface;
-use MediaWiki\Xml\Xml;
use SearchEngineFactory;
use Wikimedia\Rdbms\SelectQueryBuilder;
use Wikimedia\Rdbms\Subquery;
@@ -325,7 +324,7 @@ class SpecialRecentChangesLinked extends SpecialRecentChanges {
$extraOpts['target'] = [ $this->msg( 'recentchangeslinked-page' )->escaped(),
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' ) ];
+ Html::label( $this->msg( 'recentchangeslinked-to' )->text(), 'showlinkedto' ) ];
$this->addHelpLink( 'Help:Related changes' );
return $extraOpts;
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index ead95b2cd6d..36d46c558d7 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -47,7 +47,6 @@ use MediaWiki\Status\Status;
use MediaWiki\Title\NamespaceInfo;
use MediaWiki\Title\Title;
use MediaWiki\User\Options\UserOptionsManager;
-use MediaWiki\Xml\Xml;
use SearchEngine;
use SearchEngineConfig;
use SearchEngineFactory;
@@ -655,7 +654,7 @@ class SpecialSearch extends SpecialPage {
];
$subtitle .= ' (';
- $subtitle .= Xml::element(
+ $subtitle .= Html::element(
'a',
[
'href' => $this->getPageTitle()->getLocalURL( $params ),
diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php
index ac4d206c9a2..44c0cfa2c69 100644
--- a/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@ -28,7 +28,6 @@ use MediaWiki\Html\Html;
use MediaWiki\HTMLForm\HTMLForm;
use MediaWiki\MainConfigNames;
use MediaWiki\SpecialPage\SpecialPage;
-use MediaWiki\Xml\Xml;
/**
* A special page that lists tags for edits
@@ -196,12 +195,12 @@ class SpecialTags extends SpecialPage {
string $tag, int $hitcount, bool $showManageActions, bool $showDeleteActions, bool $showEditLinks
): string {
$newRow = '';
- $newRow .= Html::rawElement( 'td', [], Xml::element( 'code', [], $tag ) );
+ $newRow .= Html::rawElement( 'td', [], Html::element( 'code', [], $tag ) );
$linkRenderer = $this->getLinkRenderer();
$disp = ChangeTags::tagDescription( $tag, $this->getContext() );
if ( $disp === false ) {
- $disp = Xml::element( 'em', [], $this->msg( 'tags-hidden' )->text() );
+ $disp = Html::element( 'em', [], $this->msg( 'tags-hidden' )->text() );
}
if ( $showEditLinks ) {
$disp .= ' ';
@@ -250,7 +249,7 @@ class SpecialTags extends SpecialPage {
if ( !$sourceMsgs ) {
$sourceMsgs[] = $this->msg( 'tags-source-none' )->escaped();
}
- $newRow .= Html::rawElement( 'td', [], implode( Xml::element( 'br' ), $sourceMsgs ) );
+ $newRow .= Html::rawElement( 'td', [], implode( Html::element( 'br' ), $sourceMsgs ) );
$isActive = $isExplicit || isset( $this->softwareActivatedTags[$tag] );
$activeMsg = ( $isActive ? 'tags-active-yes' : 'tags-active-no' );
diff --git a/includes/specials/SpecialWhatLinksHere.php b/includes/specials/SpecialWhatLinksHere.php
index ecdcfaf78eb..4c9110f7370 100644
--- a/includes/specials/SpecialWhatLinksHere.php
+++ b/includes/specials/SpecialWhatLinksHere.php
@@ -34,7 +34,6 @@ use MediaWiki\SpecialPage\FormSpecialPage;
use MediaWiki\Title\NamespaceInfo;
use MediaWiki\Title\Title;
use MediaWiki\Title\TitleFactory;
-use MediaWiki\Xml\Xml;
use SearchEngineFactory;
use stdClass;
use Wikimedia\Rdbms\IConnectionProvider;
@@ -473,7 +472,7 @@ class SpecialWhatLinksHere extends FormSpecialPage {
$nt,
$this->getConfig()->get( MainConfigNames::MaxRedirectLinksRetrieved )
);
- $out->addHTML( Xml::closeElement( 'li' ) );
+ $out->addHTML( Html::closeElement( 'li' ) );
} else {
$out->addHTML( $this->listItem( $row, $nt, $target ) );
}
@@ -489,7 +488,7 @@ class SpecialWhatLinksHere extends FormSpecialPage {
}
protected function listStart( $level ) {
- return Xml::openElement( 'ul', ( $level ? [] : [ 'id' => 'mw-whatlinkshere-list' ] ) );
+ return Html::openElement( 'ul', ( $level ? [] : [ 'id' => 'mw-whatlinkshere-list' ] ) );
}
private function listItem( stdClass $row, PageIdentity $nt, LinkTarget $target, bool $notClose = false ): string {
@@ -549,12 +548,12 @@ class SpecialWhatLinksHere extends FormSpecialPage {
);
return $notClose ?
- Xml::openElement( 'li' ) . "$link $propsText $wlh\n" :
+ Html::openElement( 'li' ) . "$link $propsText $wlh\n" :
Html::rawElement( 'li', [], "$link $propsText $wlh" ) . "\n";
}
protected function listEnd() {
- return Xml::closeElement( 'ul' );
+ return Html::closeElement( 'ul' );
}
protected function wlhLink( Title $target, $text, $editText ) {
diff --git a/includes/specials/pagers/ImageListPager.php b/includes/specials/pagers/ImageListPager.php
index 7e78f7087bf..fccf4e3221b 100644
--- a/includes/specials/pagers/ImageListPager.php
+++ b/includes/specials/pagers/ImageListPager.php
@@ -37,7 +37,6 @@ use MediaWiki\Title\Title;
use MediaWiki\User\User;
use MediaWiki\User\UserIdentityValue;
use MediaWiki\User\UserNameUtils;
-use MediaWiki\Xml\Xml;
use UnexpectedValueException;
use Wikimedia\Rdbms\FakeResultWrapper;
use Wikimedia\Rdbms\IConnectionProvider;
@@ -574,7 +573,7 @@ class ImageListPager extends TablePager {
$opt = [ 'time' => wfTimestamp( TS_MW, $this->mCurrentRow->img_timestamp ) ];
$file = $this->localRepo->findFile( $value, $opt );
if ( $file ) {
- $download = Xml::element(
+ $download = Html::element(
'a',
[ 'href' => $file->getUrl() ],
$imgfile

File Metadata

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

Event Timeline