[MediaWiki-commits] [Gerrit] Use Title::equals in MovePage when updating watchlist entries - change (mediawiki/core)

[Aude (Code Review)]

Aude has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/263516

Change subject: Use Title::equals in MovePage when updating watchlist entries
......................................................................

Use Title::equals in MovePage when updating watchlist entries

Also, test for watchlist entries being updated in MovePageTest

Change-Id: I91f9124e96cc9cad8e4fad4e00a0169693408ade
---
M includes/MovePage.php
M tests/phpunit/includes/MovePageTest.php
2 files changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/263516/1

diff --git a/includes/MovePage.php b/includes/MovePage.php
index fb0ca8c..2d192cc 100644
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -361,11 +361,7 @@
                }
 
                # Update watchlists
-               $oldtitle = $this->oldTitle->getDBkey();
-               $newtitle = $this->newTitle->getDBkey();
-               $oldsnamespace = MWNamespace::getSubject( 
$this->oldTitle->getNamespace() );
-               $newsnamespace = MWNamespace::getSubject( 
$this->newTitle->getNamespace() );
-               if ( $oldsnamespace != $newsnamespace || $oldtitle != $newtitle 
) {
+               if ( !$this->oldTitle->equals( $this->newTitle ) ) {
                        WatchedItem::duplicateEntries( $this->oldTitle, 
$this->newTitle );
                }
 
diff --git a/tests/phpunit/includes/MovePageTest.php 
b/tests/phpunit/includes/MovePageTest.php
index 0ef2fa6..6059248 100644
--- a/tests/phpunit/includes/MovePageTest.php
+++ b/tests/phpunit/includes/MovePageTest.php
@@ -52,6 +52,10 @@
                        WikiPage::factory( $newTitle )->getRevision()
                );
 
+               $user = User::newFromName( 'UTSysop' );
+               $watchedItem = WatchedItem::fromUserTitle( $user, $oldTitle );
+               $watchedItem->addWatch();
+
                $this->assertTrue( $oldTitle->moveTo( $newTitle, false, 
'test1', true ) );
                $this->assertNotNull(
                        WikiPage::factory( $oldTitle )->getRevision()
@@ -59,5 +63,8 @@
                $this->assertNotNull(
                        WikiPage::factory( $newTitle )->getRevision()
                );
+
+               $newWatchedItem = WatchedItem::fromUserTitle( $user, $newTitle 
);
+               $this->assertTrue( $newWatchedItem->isWatched(), 'Moved page is 
being watched' );
        }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/263516
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91f9124e96cc9cad8e4fad4e00a0169693408ade
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits