| Index: branches/preferences-work/phase3/includes/Preferences.php |
| — | — | @@ -203,8 +203,55 @@ |
| 204 | 204 | 'label-message' => 'tog-fancysig', |
| 205 | 205 | 'section' => 'personal' |
| 206 | 206 | ); |
| 207 | | - |
| | 207 | + |
| | 208 | + |
| | 209 | + ## Email ####################################### |
| | 210 | + ## Email stuff |
| | 211 | + global $wgEnableEmail, $wgEnableUserEmail; |
| | 212 | + if ($wgEnableEmail) { |
| 208 | 213 | |
| | 214 | + if ($wgEnableUserEmail) { |
| | 215 | + $defaultPreferences['disableemail'] = |
| | 216 | + array( |
| | 217 | + 'type' => 'toggle', |
| | 218 | + 'invert' => true, |
| | 219 | + 'section' => 'email', |
| | 220 | + 'label-message' => 'allowemail', |
| | 221 | + ); |
| | 222 | + $defaultPreferences['ccmeonemails'] = |
| | 223 | + array( |
| | 224 | + 'type' => 'toggle', |
| | 225 | + 'section' => 'email', |
| | 226 | + 'label-message' => 'tog-ccmeonemails', |
| | 227 | + ); |
| | 228 | + } |
| | 229 | + |
| | 230 | + $defaultPreferences['enotifwatchlistpages'] = |
| | 231 | + array( |
| | 232 | + 'type' => 'toggle', |
| | 233 | + 'section' => 'email', |
| | 234 | + 'label-message' => 'tog-enotifwatchlistpages', |
| | 235 | + ); |
| | 236 | + $defaultPreferences['enotifusertalkpages'] = |
| | 237 | + array( |
| | 238 | + 'type' => 'toggle', |
| | 239 | + 'section' => 'email', |
| | 240 | + 'label-message' => 'tog-enotifusertalkpages', |
| | 241 | + ); |
| | 242 | + $defaultPreferences['enotifminoredits'] = |
| | 243 | + array( |
| | 244 | + 'type' => 'toggle', |
| | 245 | + 'section' => 'email', |
| | 246 | + 'label-message' => 'tog-enotifminoredits', |
| | 247 | + ); |
| | 248 | + $defaultPreferences['enotifrevealaddr'] = |
| | 249 | + array( |
| | 250 | + 'type' => 'toggle', |
| | 251 | + 'section' => 'email', |
| | 252 | + 'label-message' => 'tog-enotifrevealaddr' |
| | 253 | + ); |
| | 254 | + } |
| | 255 | + |
| 209 | 256 | ## Skin ##################################### |
| 210 | 257 | global $wgAllowUserSkin; |
| 211 | 258 | |
| — | — | @@ -632,53 +679,6 @@ |
| 633 | 680 | 'label-message' => 'tog-uselivepreview', |
| 634 | 681 | ); |
| 635 | 682 | |
| 636 | | - ## Email ####################################### |
| 637 | | - ## Email stuff |
| 638 | | - global $wgEnableEmail, $wgEnableUserEmail; |
| 639 | | - if ($wgEnableEmail) { |
| 640 | | - |
| 641 | | - if ($wgEnableUserEmail) { |
| 642 | | - $defaultPreferences['disableemail'] = |
| 643 | | - array( |
| 644 | | - 'type' => 'toggle', |
| 645 | | - 'invert' => true, |
| 646 | | - 'section' => 'email', |
| 647 | | - 'label-message' => 'allowemail', |
| 648 | | - ); |
| 649 | | - $defaultPreferences['ccmeonemails'] = |
| 650 | | - array( |
| 651 | | - 'type' => 'toggle', |
| 652 | | - 'section' => 'email', |
| 653 | | - 'label-message' => 'tog-ccmeonemails', |
| 654 | | - ); |
| 655 | | - } |
| 656 | | - |
| 657 | | - $defaultPreferences['enotifwatchlistpages'] = |
| 658 | | - array( |
| 659 | | - 'type' => 'toggle', |
| 660 | | - 'section' => 'email', |
| 661 | | - 'label-message' => 'tog-enotifwatchlistpages', |
| 662 | | - ); |
| 663 | | - $defaultPreferences['enotifusertalkpages'] = |
| 664 | | - array( |
| 665 | | - 'type' => 'toggle', |
| 666 | | - 'section' => 'email', |
| 667 | | - 'label-message' => 'tog-enotifusertalkpages', |
| 668 | | - ); |
| 669 | | - $defaultPreferences['enotifminoredits'] = |
| 670 | | - array( |
| 671 | | - 'type' => 'toggle', |
| 672 | | - 'section' => 'email', |
| 673 | | - 'label-message' => 'tog-enotifminoredits', |
| 674 | | - ); |
| 675 | | - $defaultPreferences['enotifrevealaddr'] = |
| 676 | | - array( |
| 677 | | - 'type' => 'toggle', |
| 678 | | - 'section' => 'email', |
| 679 | | - 'label-message' => 'tog-enotifrevealaddr' |
| 680 | | - ); |
| 681 | | - } |
| 682 | | - |
| 683 | 683 | ## Prod in defaults from the user |
| 684 | 684 | global $wgDefaultUserOptions; |
| 685 | 685 | foreach( $defaultPreferences as $name => &$info ) { |