X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fchanges%2FCategoryMembershipChange.php;h=f095b64f82682b12595057b713ad32e6ecbf7cad;hb=689c847a32e7fe8a0b3a559a88a627a252c5018e;hp=515ab0561ac054b356b6d2989fee1cd05b6868a8;hpb=2fdcd7bfdd95a3b1515b9a94289d67eb60add484;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/changes/CategoryMembershipChange.php b/includes/changes/CategoryMembershipChange.php
index 515ab0561a..f095b64f82 100644
--- a/includes/changes/CategoryMembershipChange.php
+++ b/includes/changes/CategoryMembershipChange.php
@@ -71,7 +71,7 @@ class CategoryMembershipChange {
 			$this->timestamp = $revision->getTimestamp();
 		}
 		$this->revision = $revision;
-		$this->newForCategorizationCallback = [ 'RecentChange', 'newForCategorization' ];
+		$this->newForCategorizationCallback = [ RecentChange::class, 'newForCategorization' ];
 	}
 
 	/**
@@ -129,12 +129,13 @@ class CategoryMembershipChange {
 			$this->getUser(),
 			$this->getChangeMessageText(
 				$type,
-				[ 'prefixedText' => $this->pageTitle->getPrefixedText() ],
+				$this->pageTitle->getPrefixedText(),
 				$this->numTemplateLinks
 			),
 			$this->pageTitle,
 			$this->getPreviousRevisionTimestamp(),
-			$this->revision
+			$this->revision,
+			$type === self::CATEGORY_ADDITION
 		);
 	}
 
@@ -146,6 +147,7 @@ class CategoryMembershipChange {
 	 * @param Title $pageTitle Title of the page that is being added or removed
 	 * @param string $lastTimestamp Parent revision timestamp of this change in TS_MW format
 	 * @param Revision|null $revision
+	 * @param bool $added true, if the category was added, false for removed
 	 *
 	 * @throws MWException
 	 */
@@ -156,7 +158,8 @@ class CategoryMembershipChange {
 		$comment,
 		Title $pageTitle,
 		$lastTimestamp,
-		$revision
+		$revision,
+		$added
 	) {
 		$deleted = $revision ? $revision->getVisibility() & Revision::SUPPRESSED_USER : 0;
 		$newRevId = $revision ? $revision->getId() : 0;
@@ -197,7 +200,8 @@ class CategoryMembershipChange {
 				$lastTimestamp,
 				$bot,
 				$ip,
-				$deleted
+				$deleted,
+				$added
 			]
 		);
 		$rc->save();
@@ -245,13 +249,12 @@ class CategoryMembershipChange {
 	 *
 	 * @param int $type may be CategoryMembershipChange::CATEGORY_ADDITION
 	 * or CategoryMembershipChange::CATEGORY_REMOVAL
-	 * @param array $params
-	 * - prefixedText: result of Title::->getPrefixedText()
+	 * @param string $prefixedText result of Title::->getPrefixedText()
 	 * @param int $numTemplateLinks
 	 *
 	 * @return string
 	 */
-	private function getChangeMessageText( $type, array $params, $numTemplateLinks ) {
+	private function getChangeMessageText( $type, $prefixedText, $numTemplateLinks ) {
 		$array = [
 			self::CATEGORY_ADDITION => 'recentchanges-page-added-to-category',
 			self::CATEGORY_REMOVAL => 'recentchanges-page-removed-from-category',
@@ -263,7 +266,7 @@ class CategoryMembershipChange {
 			$msgKey .= '-bundled';
 		}
 
-		return wfMessage( $msgKey, $params )->inContentLanguage()->text();
+		return wfMessage( $msgKey, $prefixedText )->inContentLanguage()->text();
 	}
 
 	/**