| Index: branches/wmf-deployment/includes/Preferences.php |
| — | — | @@ -354,20 +354,27 @@ |
| 355 | 355 | ); |
| 356 | 356 | } |
| 357 | 357 | |
| 358 | | - $defaultPreferences['enotifwatchlistpages'] = |
| 359 | | - array( |
| 360 | | - 'type' => 'toggle', |
| 361 | | - 'section' => 'personal/email', |
| 362 | | - 'label-message' => 'tog-enotifwatchlistpages', |
| 363 | | - 'disabled' => $disableEmailPrefs, |
| 364 | | - ); |
| 365 | | - $defaultPreferences['enotifusertalkpages'] = |
| 366 | | - array( |
| 367 | | - 'type' => 'toggle', |
| 368 | | - 'section' => 'personal/email', |
| 369 | | - 'label-message' => 'tog-enotifusertalkpages', |
| 370 | | - 'disabled' => $disableEmailPrefs, |
| 371 | | - ); |
| | 358 | + global $wgEnotifWatchlist; |
| | 359 | + if ( $wgEnotifWatchlist ) { |
| | 360 | + $defaultPreferences['enotifwatchlistpages'] = |
| | 361 | + array( |
| | 362 | + 'type' => 'toggle', |
| | 363 | + 'section' => 'personal/email', |
| | 364 | + 'label-message' => 'tog-enotifwatchlistpages', |
| | 365 | + 'disabled' => $disableEmailPrefs, |
| | 366 | + ); |
| | 367 | + } |
| | 368 | + global $wgEnotifUserTalk; |
| | 369 | + if( $wgEnotifUserTalk ) { |
| | 370 | + $defaultPreferences['enotifusertalkpages'] = |
| | 371 | + array( |
| | 372 | + 'type' => 'toggle', |
| | 373 | + 'section' => 'personal/email', |
| | 374 | + 'label-message' => 'tog-enotifusertalkpages', |
| | 375 | + 'disabled' => $disableEmailPrefs, |
| | 376 | + ); |
| | 377 | + } |
| | 378 | + if( $wgEnotifUserTalk || $wgEnotifWatchlist ) { |
| 372 | 379 | $defaultPreferences['enotifminoredits'] = |
| 373 | 380 | array( |
| 374 | 381 | 'type' => 'toggle', |
| — | — | @@ -375,6 +382,7 @@ |
| 376 | 383 | 'label-message' => 'tog-enotifminoredits', |
| 377 | 384 | 'disabled' => $disableEmailPrefs, |
| 378 | 385 | ); |
| | 386 | + } |
| 379 | 387 | $defaultPreferences['enotifrevealaddr'] = |
| 380 | 388 | array( |
| 381 | 389 | 'type' => 'toggle', |
| Property changes on: branches/wmf-deployment/includes/Preferences.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 382 | 390 | + /branches/REL1_15/phase3/includes/Preferences.php:51646 |
| /trunk/phase3/includes/Preferences.php:52290,52402,52404,52718,52737,52759,52762,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178 |