Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Bug 41298) partial fix: re-apply I9441a277

Browse source 
Apparently, this change got lost during merge. Oops.

Change-Id: I75ddf1d9f2abfa97fb76d47da6fadd63658c0d46
This commit is contained in:
daniel 2012-10-24 15:19:44 +02:00
parent 1fc39609eb
commit 0fcd7a6778
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
includes/EditPage.php
View file

@ -1603,7 +1603,7 @@ class EditPage {
if ( $doEditStatus->isOK() ) {
$result['redirect'] = $content->isRedirect();
$this->commitWatch();
$this->updateWatchlist();
wfProfileOut( __METHOD__ );
return $status;
} else {
@ -1624,19 +1624,27 @@ class EditPage {
}
/**
* Commit the change of watch status
* Register the change of watch status
*/
protected function commitWatch() {
protected function updateWatchlist() {
global $wgUser;
if ( $wgUser->isLoggedIn() && $this->watchthis != $wgUser->isWatched( $this->mTitle ) ) {
$fname = __METHOD__;
$title = $this->mTitle;
$watch = $this->watchthis;
// Do this in its own transaction to reduce contention...
$dbw = wfGetDB( DB_MASTER );
$dbw->begin( __METHOD__ );
if ( $this->watchthis ) {
WatchAction::doWatch( $this->mTitle, $wgUser );
} else {
WatchAction::doUnwatch( $this->mTitle, $wgUser );
}
$dbw->commit( __METHOD__ );
$dbw->onTransactionIdle( function() use ( $dbw, $title, $watch, $wgUser, $fname ) {
$dbw->begin( $fname );
if ( $watch ) {
WatchAction::doWatch( $title, $wgUser );
} else {
WatchAction::doUnwatch( $title, $wgUser );
}
$dbw->commit( $fname );
} );
}
}