| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -355,28 +355,36 @@ |
| 356 | 356 | 'disabled' => $disableEmailPrefs, |
| 357 | 357 | ); |
| 358 | 358 | } |
| 359 | | - |
| 360 | | - $defaultPreferences['enotifwatchlistpages'] = |
| 361 | | - array( |
| 362 | | - 'type' => 'toggle', |
| 363 | | - 'section' => 'personal/email', |
| 364 | | - 'label-message' => 'tog-enotifwatchlistpages', |
| 365 | | - 'disabled' => $disableEmailPrefs, |
| 366 | | - ); |
| 367 | | - $defaultPreferences['enotifusertalkpages'] = |
| 368 | | - array( |
| 369 | | - 'type' => 'toggle', |
| 370 | | - 'section' => 'personal/email', |
| 371 | | - 'label-message' => 'tog-enotifusertalkpages', |
| 372 | | - 'disabled' => $disableEmailPrefs, |
| 373 | | - ); |
| 374 | | - $defaultPreferences['enotifminoredits'] = |
| 375 | | - array( |
| 376 | | - 'type' => 'toggle', |
| 377 | | - 'section' => 'personal/email', |
| 378 | | - 'label-message' => 'tog-enotifminoredits', |
| 379 | | - 'disabled' => $disableEmailPrefs, |
| 380 | | - ); |
| | 359 | + |
| | 360 | + global $wgEnotifWatchlist; |
| | 361 | + if ( $wgEnotifWatchlist ) { |
| | 362 | + $defaultPreferences['enotifwatchlistpages'] = |
| | 363 | + array( |
| | 364 | + 'type' => 'toggle', |
| | 365 | + 'section' => 'personal/email', |
| | 366 | + 'label-message' => 'tog-enotifwatchlistpages', |
| | 367 | + 'disabled' => $disableEmailPrefs, |
| | 368 | + ); |
| | 369 | + } |
| | 370 | + global $wgEnotifUserTalk; |
| | 371 | + if( $wgEnotifUserTalk ) { |
| | 372 | + $defaultPreferences['enotifusertalkpages'] = |
| | 373 | + array( |
| | 374 | + 'type' => 'toggle', |
| | 375 | + 'section' => 'personal/email', |
| | 376 | + 'label-message' => 'tog-enotifusertalkpages', |
| | 377 | + 'disabled' => $disableEmailPrefs, |
| | 378 | + ); |
| | 379 | + } |
| | 380 | + if( $wgEnotifUserTalk || $wgEnotifWatchlist ) { |
| | 381 | + $defaultPreferences['enotifminoredits'] = |
| | 382 | + array( |
| | 383 | + 'type' => 'toggle', |
| | 384 | + 'section' => 'personal/email', |
| | 385 | + 'label-message' => 'tog-enotifminoredits', |
| | 386 | + 'disabled' => $disableEmailPrefs, |
| | 387 | + ); |
| | 388 | + } |
| 381 | 389 | $defaultPreferences['enotifrevealaddr'] = |
| 382 | 390 | array( |
| 383 | 391 | 'type' => 'toggle', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -227,6 +227,7 @@ |
| 228 | 228 | * (bug 19509) Uploading to a file named '0' previously treated it as null input |
| 229 | 229 | and attempted to upload with the source name. Now warns about not having an |
| 230 | 230 | extension (since 0.ext is perfectly valid) |
| | 231 | +* (bug 19468) Enotif preferences are now only displayed when they are turned on |
| 231 | 232 | |
| 232 | 233 | == API changes in 1.16 == |
| 233 | 234 | |