golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hygiene: remove deprecated calls from Menu system 

Changes:
 - Title::getTalkPage() is deprecated, use NamespaceInfo instead
 - Http::isValidURI is deprecated, use MWHttpRequest instead

Change-Id: I6938fe93d18372ef855f398a506c8b5ba68b640e
This commit is contained in:
Piotr Miazga 2019-08-02 16:49:11 +02:00
parent d8de612e0c
commit 3b13e6b9f6
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
includes/menu/Definitions.php
View File

@ -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 );

20
includes/menu/User/AdvancedUserMenuBuilder.php
View File

@ -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 ) {
$this->messageLocalizer->msg( 'mobile-frontend-user-page-talk' )->escaped(), $group->insertEntry( new SingleMenuEntry( 'userTalk',
$this->user->getUserPage()->getTalkPage()->getLocalURL(), $this->messageLocalizer->msg( 'mobile-frontend-user-page-talk' )->escaped(),
true, $talkPage->getLocalURL(),
null, true,
'before', null,
'wikimedia-ui-userTalk-base20' 'before',
) ); 'wikimedia-ui-userTalk-base20'
) );
}
$sandbox = $personalTools['sandbox']['links'][0] ?? false; $sandbox = $personalTools['sandbox']['links'][0] ?? false;
if ( $sandbox ) { if ( $sandbox ) {