From: James D. Forrester <jforrester@wikimedia.org>
Date: Sat, 9 Feb 2019 20:18:35 +0000 (-0800)
Subject: Drop EmailNotification::updateWatchlistTimestamp(), deprecated in 1.27 and unused
X-Git-Tag: 1.34.0-rc.0~2880
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=4577b5f6dcf848b969714b84a6074b07dd2a2ab7;p=lhc%2Fweb%2Fwiklou.git

Drop EmailNotification::updateWatchlistTimestamp(), deprecated in 1.27 and unused

Change-Id: Idad6f5aa579e41e941d1074465dd2f0e0f4577dc
---

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index c1fd2f7e86..4253e27103 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -223,6 +223,8 @@ because of Phabricator reports.
   exception ID is the same as the request ID, from WebRequest::getRequestId().
 * SearchEngine::getNearMatchResultSet(), deprecated in 1.27, has been removed.
   You can use SearchEngine::getNearMatcher() instead.
+* EmailNotification::updateWatchlistTimestamp, deprecated in 1.27, has been
+  removed. Instead, use WatchedItemStore::updateNotificationTimestamp directly.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected
diff --git a/includes/mail/EmailNotification.php b/includes/mail/EmailNotification.php
index 76a7760d76..4d1b855d78 100644
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -24,7 +24,6 @@
  * @author Luke Welling lwelling@wikimedia.org
  */
 
-use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
 
 /**
@@ -89,33 +88,6 @@ class EmailNotification {
 		return $this->pageStatus;
 	}
 
-	/**
-	 * @deprecated since 1.27 use WatchedItemStore::updateNotificationTimestamp directly
-	 *
-	 * @param User $editor The editor that triggered the update.  Their notification
-	 *  timestamp will not be updated(they have already seen it)
-	 * @param LinkTarget $linkTarget The link target of the title to update timestamps for
-	 * @param string $timestamp Set the update timestamp to this value
-	 *
-	 * @return int[] Array of user IDs
-	 */
-	public static function updateWatchlistTimestamp(
-		User $editor,
-		LinkTarget $linkTarget,
-		$timestamp
-	) {
-		wfDeprecated( __METHOD__, '1.27' );
-		$config = RequestContext::getMain()->getConfig();
-		if ( !$config->get( 'EnotifWatchlist' ) && !$config->get( 'ShowUpdatedMarker' ) ) {
-			return [];
-		}
-		return MediaWikiServices::getInstance()->getWatchedItemStore()->updateNotificationTimestamp(
-			$editor,
-			$linkTarget,
-			$timestamp
-		);
-	}
-
 	/**
 	 * Send emails corresponding to the user $editor editing the page $title.
 	 *