wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-12-01 09:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Replace usage of deprecated User watchlist methods"

Browse source
This commit is contained in:
jenkins-bot 2021-04-28 16:11:51 +00:00 committed by Gerrit Code Review
parent db7e13e792 818d79ce9a
commit a42560c1c9
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
includes/Menu/PageActions/ToolbarBuilder.php
View file

@ -32,6 +32,7 @@ use MediaWiki\Minerva\Permissions\IMinervaPagePermissions;
use MediaWiki\Minerva\SkinOptions;
use MediaWiki\Minerva\Skins\SkinUserPageHelper;
use MediaWiki\User\UserIdentity;
use MediaWiki\Watchlist\WatchlistManager;
use MessageLocalizer;
use MinervaUI;
use MWException;
@ -80,6 +81,11 @@ class ToolbarBuilder {
*/
private $watchlistExpiryEnabled;
/**
* @var WatchlistManager
*/
private $watchlistManager;
/**
* ServiceOptions needed.
*/
@ -100,6 +106,7 @@ class ToolbarBuilder {
* Title and NOT with the user talk page Title.
* @param LanguagesHelper $languagesHelper Helper to check title languages/variants
* @param ServiceOptions $options
* @param WatchlistManager $watchlistManager
*/
public function __construct(
Title $title,
@ -109,7 +116,8 @@ class ToolbarBuilder {
SkinOptions $skinOptions,
SkinUserPageHelper $relevantUserPageHelper,
LanguagesHelper $languagesHelper,
ServiceOptions $options
ServiceOptions $options,
WatchlistManager $watchlistManager
) {
$this->title = $title;
$this->user = $user;
@ -119,6 +127,7 @@ class ToolbarBuilder {
$this->relevantUserPageHelper = $relevantUserPageHelper;
$this->languagesHelper = $languagesHelper;
$this->watchlistExpiryEnabled = $options->get( 'WatchlistExpiry' );
$this->watchlistManager = $watchlistManager;
}
/**
@ -236,10 +245,11 @@ class ToolbarBuilder {
* @throws MWException
*/
protected function createWatchPageAction(): IMenuEntry {
$isWatched = $this->user->isRegistered() && $this->user->isWatched( $this->title );
$isWatched = $this->user->isRegistered() &&
$this->watchlistManager->isWatched( $this->user, $this->title );
$isTempWatched = $this->watchlistExpiryEnabled &&
$isWatched &&
$this->user->isTempWatched( $this->title );
$this->watchlistManager->isTempWatched( $this->user, $this->title );
$newModeToSet = $isWatched ? 'unwatch' : 'watch';
$href = $this->user->isAnon()
? $this->getLoginUrl( [ 'returnto' => $this->title ] )

5
includes/ServiceWiring.php
View file

@ -93,6 +93,8 @@ return [
) :
$userPageHelper;
$watchlistManager = $services->getWatchlistManager();
$toolbarBuilder = new PageActionsMenu\ToolbarBuilder(
$title,
$user,
@ -102,7 +104,8 @@ return [
$relevantUserPageHelper,
$languagesHelper,
new ServiceOptions( PageActionsMenu\ToolbarBuilder::CONSTRUCTOR_OPTIONS,
$services->getMainConfig() )
$services->getMainConfig() ),
$watchlistManager
);
if ( $skinOptions->get( SkinOptions::TOOLBAR_SUBMENU ) ) {
$overflowBuilder = $relevantUserPageHelper->isUserPage() ?