Merge "Add BeforeResetNotificationTimestamp hook"

diff --combined includes/watcheditem/WatchedItemStore.php
index 5f38775,4abe7af..8566895
--- 1/includes/watcheditem/WatchedItemStore.php
--- 2/includes/watcheditem/WatchedItemStore.php
+++ b/includes/watcheditem/WatchedItemStore.php
@@@ -4,6 -4,7 +4,6 @@@ use Wikimedia\Rdbms\IDatabase
  use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
  use MediaWiki\Linker\LinkTarget;
  use Wikimedia\Assert\Assert;
 -use Wikimedia\Rdbms\LBFactory;
  use Wikimedia\ScopedCallback;
  use Wikimedia\Rdbms\ILBFactory;
  use Wikimedia\Rdbms\LoadBalancer;
@@@ -907,6 -908,10 +907,10 @@@ class WatchedItemStore implements Watch
                        return false;
                }
  
+               if ( ! Hooks::run( 'BeforeResetNotificationTimestamp', [ &$user, &$title, $force, &$oldid ] ) ) {
+                       return false;
+               }
+ 
                $item = null;
                if ( $force != 'force' ) {
                        $item = $this->loadWatchedItem( $user, $title );