From 627a47801ba957b85fcc8774c61b15bbee2f2dbf Mon Sep 17 00:00:00 2001 From: addshore Date: Wed, 3 Feb 2016 16:38:17 +0100 Subject: [PATCH] Use LinkTarget in EmailNotification::updateWatchlistTimestamp Change-Id: I3a59839b3ec4db42966afa1db5ad0252fafa8cb9 --- includes/mail/EmailNotification.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/includes/mail/EmailNotification.php b/includes/mail/EmailNotification.php index 8bac6b8135..9bda12cb4d 100644 --- a/includes/mail/EmailNotification.php +++ b/includes/mail/EmailNotification.php @@ -74,11 +74,15 @@ class EmailNotification { /** * @param User $editor The editor that triggered the update. Their notification * timestamp will not be updated(they have already seen it) - * @param Title $title The title to update timestamps for + * @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, Title $title, $timestamp ) { + public static function updateWatchlistTimestamp( + User $editor, + LinkTarget $linkTarget, + $timestamp + ) { global $wgEnotifWatchlist, $wgShowUpdatedMarker; if ( !$wgEnotifWatchlist && !$wgShowUpdatedMarker ) { @@ -90,8 +94,8 @@ class EmailNotification { array( 'wl_user' ), array( 'wl_user != ' . intval( $editor->getID() ), - 'wl_namespace' => $title->getNamespace(), - 'wl_title' => $title->getDBkey(), + 'wl_namespace' => $linkTarget->getNamespace(), + 'wl_title' => $linkTarget->getDBkey(), 'wl_notificationtimestamp IS NULL', ), __METHOD__ ); @@ -105,14 +109,14 @@ class EmailNotification { // Update wl_notificationtimestamp for all watching users except the editor $fname = __METHOD__; $dbw->onTransactionIdle( - function () use ( $dbw, $timestamp, $watchers, $title, $fname ) { + function () use ( $dbw, $timestamp, $watchers, $linkTarget, $fname ) { $dbw->update( 'watchlist', array( /* SET */ 'wl_notificationtimestamp' => $dbw->timestamp( $timestamp ) ), array( /* WHERE */ 'wl_user' => $watchers, - 'wl_namespace' => $title->getNamespace(), - 'wl_title' => $title->getDBkey(), + 'wl_namespace' => $linkTarget->getNamespace(), + 'wl_title' => $linkTarget->getDBkey(), ), $fname ); } -- 2.20.1