&& $watchingUser->getId() != $userTalkId
&& !in_array( $watchingUser->getName(), $wgUsersNotifiedOnAllChanges )
&& !( $wgBlockDisablesLogin && $watchingUser->isBlocked() )
+ && Hooks::run( 'SendWatchlistEmailNotification', [ $watchingUser, $title, $this ] )
) {
- if ( Hooks::run( 'SendWatchlistEmailNotification', [ $watchingUser, $title, $this ] ) ) {
- $this->compose( $watchingUser, self::WATCHLIST );
- }
+ $this->compose( $watchingUser, self::WATCHLIST );
}
}
}
$keys['$PAGETITLE'] = $this->title->getPrefixedText();
$keys['$PAGETITLE_URL'] = $this->title->getCanonicalURL();
- $keys['$PAGEMINOREDIT'] = "\n" . ( $this->minorEdit ?
- wfMessage( 'enotif_minoredit' )->inContentLanguage()->text() : '' );
+ $keys['$PAGEMINOREDIT'] = $this->minorEdit ?
+ "\n\n" . wfMessage( 'enotif_minoredit' )->inContentLanguage()->text() :
+ '';
$keys['$UNWATCHURL'] = $this->title->getCanonicalURL( 'action=unwatch' );
if ( $this->editor->isAnon() ) {