| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -347,12 +347,15 @@ |
| 348 | 348 | $wuser = $dbr->fetchObject( $res ); |
| 349 | 349 | $watchingUser->setID($wuser->wl_user); |
| 350 | 350 | |
| 351 | | - if ( ( $enotifwatchlistpage && $watchingUser->getOption('enotifwatchlistpages') ) || |
| 352 | | - ( $enotifusertalkpage |
| 353 | | - && $watchingUser->getOption('enotifusertalkpages') |
| 354 | | - && $title->equals( $watchingUser->getTalkPage() ) ) |
| 355 | | - && (!$minorEdit || ($wgEnotifMinorEdits && $watchingUser->getOption('enotifminoredits') ) ) |
| 356 | | - && ($watchingUser->isEmailConfirmed() ) ) { |
| | 351 | + if ( ( ( $enotifwatchlistpage |
| | 352 | + && $watchingUser->getOption('enotifwatchlistpages') ) |
| | 353 | + || ( $enotifusertalkpage |
| | 354 | + && $watchingUser->getOption('enotifusertalkpages') |
| | 355 | + && $title->equals( $watchingUser->getTalkPage() ) ) ) |
| | 356 | + && ( !$minorEdit |
| | 357 | + || ( $wgEnotifMinorEdits |
| | 358 | + && $watchingUser->getOption('enotifminoredits') ) ) |
| | 359 | + && ( $watchingUser->isEmailConfirmed() ) ) { |
| 357 | 360 | # ... adjust remaining text and page edit time placeholders |
| 358 | 361 | # which needs to be personalized for each user |
| 359 | 362 | if ($wgEnotifImpersonal) |