| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -433,14 +433,17 @@ |
| 434 | 434 | 'label-message' => 'tog-enotifminoredits', |
| 435 | 435 | 'disabled' => $disableEmailPrefs, |
| 436 | 436 | ); |
| | 437 | + global $wgEnotifRevealEditorAddress; |
| | 438 | + if ( $wgEnotifRevealEditorAddress ) { |
| | 439 | + $defaultPreferences['enotifrevealaddr'] = |
| | 440 | + array( |
| | 441 | + 'type' => 'toggle', |
| | 442 | + 'section' => 'personal/email', |
| | 443 | + 'label-message' => 'tog-enotifrevealaddr', |
| | 444 | + 'disabled' => $disableEmailPrefs, |
| | 445 | + ); |
| | 446 | + } |
| 437 | 447 | } |
| 438 | | - $defaultPreferences['enotifrevealaddr'] = |
| 439 | | - array( |
| 440 | | - 'type' => 'toggle', |
| 441 | | - 'section' => 'personal/email', |
| 442 | | - 'label-message' => 'tog-enotifrevealaddr', |
| 443 | | - 'disabled' => $disableEmailPrefs, |
| 444 | | - ); |
| 445 | 448 | } |
| 446 | 449 | } |
| 447 | 450 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -40,6 +40,8 @@ |
| 41 | 41 | * (bug 22709) IIS7 mishandles redirects generated by OutputPage::output() when |
| 42 | 42 | the URL contains a colon. |
| 43 | 43 | * (bug 22353) Categorised recent changes now works again |
| | 44 | +* (bug 22747) "Reveal my e-mail address in notification e-mails" preference is |
| | 45 | + now only displayed when relevant |
| 44 | 46 | |
| 45 | 47 | == API changes in 1.17 == |
| 46 | 48 | * (bug 22738) Allow filtering by action type on query=logevent |