Merge "Support UserMerge into anonymous user"

This commit is contained in:
jenkins-bot 2015-10-12 20:26:44 +00:00 committed by Gerrit Code Review
commit 49ec566a10

View file

@ -1051,7 +1051,10 @@ class EchoHooks {
public static function onMergeAccountFromTo( User &$oldUser, User &$newUser ) {
MWEchoNotifUser::newFromUser( $oldUser )->resetNotificationCount( DB_MASTER );
MWEchoNotifUser::newFromUser( $newUser )->resetNotificationCount( DB_MASTER );
if ( !$newUser->isAnon() ) {
MWEchoNotifUser::newFromUser( $newUser )->resetNotificationCount( DB_MASTER );
}
return true;
}