[MediaWiki-commits] [Gerrit] mediawiki/core[master]: MergeHistory: Duplicate watchers on history merge

2017-12-15 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393378 )

Change subject: MergeHistory: Duplicate watchers on history merge
..


MergeHistory: Duplicate watchers on history merge

Bug: T132130
Change-Id: Ibb2be4f6f975f8f3c542689530fc120f8a464914
---
M includes/MergeHistory.php
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/MergeHistory.php b/includes/MergeHistory.php
index 9d63869..b969e03 100644
--- a/includes/MergeHistory.php
+++ b/includes/MergeHistory.php
@@ -24,6 +24,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 use Wikimedia\Timestamp\TimestampException;
 use Wikimedia\Rdbms\IDatabase;
 
@@ -335,6 +336,10 @@
}
$this->dest->invalidateCache(); // update histories
 
+   // Duplicate watchers of the old article to the new article on 
history merge
+   $store = 
MediaWikiServices::getInstance()->getWatchedItemStore();
+   $store->duplicateAllAssociatedEntries( $this->source, 
$this->dest );
+
// Update our logs
$logEntry = new ManualLogEntry( 'merge', 'merge' );
$logEntry->setPerformer( $user );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb2be4f6f975f8f3c542689530fc120f8a464914
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: MergeHistory: Duplicate watchers on history merge

2017-11-25 Thread Fomafix (Code Review) 
Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393378 )

Change subject: MergeHistory: Duplicate watchers on history merge
..

MergeHistory: Duplicate watchers on history merge

Bug: T132130
Change-Id: Ibb2be4f6f975f8f3c542689530fc120f8a464914
---
M includes/MergeHistory.php
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/393378/1

diff --git a/includes/MergeHistory.php b/includes/MergeHistory.php
index 9d63869..2b7372f 100644
--- a/includes/MergeHistory.php
+++ b/includes/MergeHistory.php
@@ -335,6 +335,10 @@
}
$this->dest->invalidateCache(); // update histories
 
+   // Duplicate watchers of the old article to the new article on 
history merge
+   $store = WatchedItemStore::getDefaultInstance();
+   $store->duplicateAllAssociatedEntries( $this->source, 
$this->dest );
+
// Update our logs
$logEntry = new ManualLogEntry( 'merge', 'merge' );
$logEntry->setPerformer( $user );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb2be4f6f975f8f3c542689530fc120f8a464914
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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