X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialRecentChanges.php;h=6949c6185c76baaf4a8b05f066a4c11ecc10bec8;hb=e19e6bfabcaf2b6aa5dd837ff7057bd6a25baef8;hp=c8f65c1bcb1eb79e1cfe56ef28d65e0affe0f3bc;hpb=89b0d88c386393eb42f6a5c086928031db9459a7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialRecentChanges.php b/includes/specials/SpecialRecentChanges.php
index c8f65c1bcb..4683fe6861 100644
--- a/includes/specials/SpecialRecentChanges.php
+++ b/includes/specials/SpecialRecentChanges.php
@@ -159,7 +159,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		}
 
 		$this->addHelpLink(
-			'//meta.wikimedia.org/wiki/Special:MyLanguage/Help:Recent_changes',
+			'https://meta.wikimedia.org/wiki/Special:MyLanguage/Help:Recent_changes',
 			true
 		);
 		parent::execute( $subpage );
@@ -185,7 +185,9 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		if (
 			!$this->including() &&
 			$this->getUser()->isLoggedIn() &&
-			$this->getUser()->isAllowed( 'viewmywatchlist' )
+			MediaWikiServices::getInstance()
+				->getPermissionManager()
+				->userHasRight( $this->getUser(), 'viewmywatchlist' )
 		) {
 			$this->registerFiltersFromDefinitions( [ $this->watchlistFilterGroupDefinition ] );
 			$watchlistGroup = $this->getFilterGroup( 'watchlist' );
@@ -197,26 +199,36 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		$user = $this->getUser();
 
 		$significance = $this->getFilterGroup( 'significance' );
+		/** @var ChangesListBooleanFilter $hideMinor */
 		$hideMinor = $significance->getFilter( 'hideminor' );
+		'@phan-var ChangesListBooleanFilter $hideMinor';
 		$hideMinor->setDefault( $user->getBoolOption( 'hideminor' ) );
 
 		$automated = $this->getFilterGroup( 'automated' );
+		/** @var ChangesListBooleanFilter $hideBots */
 		$hideBots = $automated->getFilter( 'hidebots' );
+		'@phan-var ChangesListBooleanFilter $hideBots';
 		$hideBots->setDefault( true );
 
+		/** @var ChangesListStringOptionsFilterGroup|null $reviewStatus */
 		$reviewStatus = $this->getFilterGroup( 'reviewStatus' );
+		'@phan-var ChangesListStringOptionsFilterGroup|null $reviewStatus';
 		if ( $reviewStatus !== null ) {
 			// Conditional on feature being available and rights
 			if ( $user->getBoolOption( 'hidepatrolled' ) ) {
 				$reviewStatus->setDefault( 'unpatrolled' );
 				$legacyReviewStatus = $this->getFilterGroup( 'legacyReviewStatus' );
+				/** @var ChangesListBooleanFilter $legacyHidePatrolled */
 				$legacyHidePatrolled = $legacyReviewStatus->getFilter( 'hidepatrolled' );
+				'@phan-var ChangesListBooleanFilter $legacyHidePatrolled';
 				$legacyHidePatrolled->setDefault( true );
 			}
 		}
 
 		$changeType = $this->getFilterGroup( 'changeType' );
+		/** @var ChangesListBooleanFilter $hideCategorization */
 		$hideCategorization = $changeType->getFilter( 'hidecategorization' );
+		'@phan-var ChangesListBooleanFilter $hideCategorization';
 		if ( $hideCategorization !== null ) {
 			// Conditional on feature being available
 			$hideCategorization->setDefault( $user->getBoolOption( 'hidecategorization' ) );
@@ -269,7 +281,10 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		$join_conds = array_merge( $join_conds, $rcQuery['joins'] );
 
 		// JOIN on watchlist for users
-		if ( $user->isLoggedIn() && $user->isAllowed( 'viewmywatchlist' ) ) {
+		if ( $user->isLoggedIn() && MediaWikiServices::getInstance()
+				->getPermissionManager()
+				->userHasRight( $user, 'viewmywatchlist' )
+		) {
 			$tables[] = 'watchlist';
 			$fields[] = 'wl_user';
 			$fields[] = 'wl_notificationtimestamp';
@@ -515,15 +530,16 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		if ( $this->isStructuredFilterUiEnabled() ) {
 			$rcfilterContainer = Html::element(
 				'div',
-				[ 'class' => 'rcfilters-container' ]
+				// TODO: Remove deprecated rcfilters-container class
+				[ 'class' => 'rcfilters-container mw-rcfilters-container' ]
 			);
 
 			$loadingContainer = Html::rawElement(
 				'div',
-				[ 'class' => 'rcfilters-spinner' ],
+				[ 'class' => 'mw-rcfilters-spinner' ],
 				Html::element(
 					'div',
-					[ 'class' => 'rcfilters-spinner-bounce' ]
+					[ 'class' => 'mw-rcfilters-spinner-bounce' ]
 				)
 			);
 
@@ -531,7 +547,8 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 			$this->getOutput()->addHTML(
 				Html::rawElement(
 					'div',
-					[ 'class' => 'rcfilters-head' ],
+					// TODO: Remove deprecated rcfilters-head class
+					[ 'class' => 'rcfilters-head mw-rcfilters-head' ],
 					$rcfilterContainer . $rcoptions
 				)
 			);
@@ -845,7 +862,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		sort( $linkLimits );
 		$linkLimits = array_unique( $linkLimits );
 
-		$linkDays = $config->get( 'RCLinkDays' );
+		$linkDays = $this->getLinkDays();
 		$linkDays[] = $options['days'];
 		sort( $linkDays );
 		$linkDays = array_unique( $linkDays );
@@ -916,7 +933,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 			[ 'class' => 'rclistfrom' ],
 			$this->makeOptionsLink(
 				$this->msg( 'rclistfrom' )->plaintextParams( $now, $timenow, $datenow )->parse(),
-				[ 'from' => $timestamp ],
+				[ 'from' => $timestamp, 'fromFormatted' => $now ],
 				$nondefaults
 			)
 		);