Merge "Hygiene: remove deprecated calls from Menu system"
This commit is contained in:
commit
628e7a703a
|
@ -30,6 +30,7 @@ use MediaWiki\Minerva\Menu\Entries\SingleMenuEntry;
|
||||||
use Message;
|
use Message;
|
||||||
use MinervaUI;
|
use MinervaUI;
|
||||||
use MWException;
|
use MWException;
|
||||||
|
use MWHttpRequest;
|
||||||
use SpecialMobileWatchlist;
|
use SpecialMobileWatchlist;
|
||||||
use SpecialPage;
|
use SpecialPage;
|
||||||
use Title;
|
use Title;
|
||||||
|
@ -302,7 +303,7 @@ final class Definitions {
|
||||||
}
|
}
|
||||||
$inContentLang = $message->inContentLanguage();
|
$inContentLang = $message->inContentLanguage();
|
||||||
$titleName = $inContentLang->plain();
|
$titleName = $inContentLang->plain();
|
||||||
if ( $inContentLang->isDisabled() || \Http::isValidURI( $titleName ) ) {
|
if ( $inContentLang->isDisabled() || MWHttpRequest::isValidURI( $titleName ) ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$title = Title::newFromText( $titleName );
|
$title = Title::newFromText( $titleName );
|
||||||
|
|
|
@ -68,15 +68,17 @@ final class AdvancedUserMenuBuilder implements IUserMenuBuilder {
|
||||||
public function getGroup( array $personalTools ): Group {
|
public function getGroup( array $personalTools ): Group {
|
||||||
$group = new Group();
|
$group = new Group();
|
||||||
$group->insertEntry( new ProfileMenuEntry( $this->user ) );
|
$group->insertEntry( new ProfileMenuEntry( $this->user ) );
|
||||||
$group->insertEntry( new SingleMenuEntry(
|
$talkPage = $this->user->getUserPage()->getTalkPageIfDefined();
|
||||||
'userTalk',
|
if ( $talkPage ) {
|
||||||
|
$group->insertEntry( new SingleMenuEntry( 'userTalk',
|
||||||
$this->messageLocalizer->msg( 'mobile-frontend-user-page-talk' )->escaped(),
|
$this->messageLocalizer->msg( 'mobile-frontend-user-page-talk' )->escaped(),
|
||||||
$this->user->getUserPage()->getTalkPage()->getLocalURL(),
|
$talkPage->getLocalURL(),
|
||||||
true,
|
true,
|
||||||
null,
|
null,
|
||||||
'before',
|
'before',
|
||||||
'wikimedia-ui-userTalk-base20'
|
'wikimedia-ui-userTalk-base20'
|
||||||
) );
|
) );
|
||||||
|
}
|
||||||
$sandbox = $personalTools['sandbox']['links'][0] ?? false;
|
$sandbox = $personalTools['sandbox']['links'][0] ?? false;
|
||||||
|
|
||||||
if ( $sandbox ) {
|
if ( $sandbox ) {
|
||||||
|
|
Loading…
Reference in New Issue