From dc4e9a3db7c87c352ed73ee1b141c1f5e1a4462b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 20 Sep 2007 19:55:22 +0000 Subject: [PATCH] * (bug 4918) Clean up logic for email notification minor edit option. I haven't been able to reproduce the bug, though, so not sure if there's no effect or what. Seems to work equally before and after. --- includes/UserMailer.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/includes/UserMailer.php b/includes/UserMailer.php index 835dd3107f..436c63f382 100644 --- a/includes/UserMailer.php +++ b/includes/UserMailer.php @@ -347,12 +347,15 @@ class EmailNotification { $wuser = $dbr->fetchObject( $res ); $watchingUser->setID($wuser->wl_user); - if ( ( $enotifwatchlistpage && $watchingUser->getOption('enotifwatchlistpages') ) || - ( $enotifusertalkpage - && $watchingUser->getOption('enotifusertalkpages') - && $title->equals( $watchingUser->getTalkPage() ) ) - && (!$minorEdit || ($wgEnotifMinorEdits && $watchingUser->getOption('enotifminoredits') ) ) - && ($watchingUser->isEmailConfirmed() ) ) { + if ( ( ( $enotifwatchlistpage + && $watchingUser->getOption('enotifwatchlistpages') ) + || ( $enotifusertalkpage + && $watchingUser->getOption('enotifusertalkpages') + && $title->equals( $watchingUser->getTalkPage() ) ) ) + && ( !$minorEdit + || ( $wgEnotifMinorEdits + && $watchingUser->getOption('enotifminoredits') ) ) + && ( $watchingUser->isEmailConfirmed() ) ) { # ... adjust remaining text and page edit time placeholders # which needs to be personalized for each user if ($wgEnotifImpersonal) -- 2.20.1