Merge "parser: list the vary-* flags in the NewPP report HTML comment"

diff --git a/includes/watcheditem/WatchedItemStore.php b/includes/watcheditem/WatchedItemStore.php
index ec25002..8560624 100644 (file)
--- a/includes/watcheditem/WatchedItemStore.php
+++ b/includes/watcheditem/WatchedItemStore.php
@@ -1120,7 +1120,7 @@ class WatchedItemStore implements WatchedItemStoreInterface, StatsdAwareInterfac
                }
 
                $oldRev = $this->revisionLookup->getRevisionById( $oldid );
-               $nextRev = $this->revisionLookup->getNextRevision( $oldRev, $title );
+               $nextRev = $this->revisionLookup->getNextRevision( $oldRev );
                if ( !$nextRev ) {
                        // Oldid given and is the latest revision for this title; clear the timestamp.
                        return null;

diff --git a/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
index 82308de..7ec2d37 100644 (file)
--- a/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
+++ b/tests/phpunit/includes/watcheditem/WatchedItemStoreUnitTest.php
@@ -2094,9 +2094,8 @@ class WatchedItemStoreUnitTest extends MediaWikiTestCase {
                                return $mockRevisionRecord;
                        },
                        'getNextRevision' =>
-                       function ( $oldRev, $titleArg ) use ( $mockRevisionRecord, $title ) {
+                       function ( $oldRev ) use ( $mockRevisionRecord ) {
                                $this->assertSame( $mockRevisionRecord, $oldRev );
-                               $this->assertSame( $title, $titleArg );
                                return false;
                        },
                ], [