* (bug 13982) Disable ccmeonemails preference when user-to-user mails disabled

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 69e7b4b..8fe6912 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -251,6 +251,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Show correct accesskey prefix for Firefox 3 beta (Alt-Shift-, not Alt-)
 * (bug 13949) Special:PrefixIndex/AllPages paging links contain invalid XML
 * (bug 13770) Use Preprocessor_Hash by default to avoid missing DOM module errors
+* (bug 13982) Disable ccmeonemails preference when user-to-user mails disabled
+
 
 === API changes in 1.13 ===
 

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 76a16a9..c9ab9a7 100644 (file)
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -737,10 +737,13 @@ class PreferencesForm {
 
                        $moreEmail = '';
                        if ($wgEnableUserEmail) {
+                               // fixme -- the "allowemail" pseudotoggle is a hacked-together
+                               // inversion for the "disableemail" preference.
                                $emf = wfMsg( 'allowemail' );
                                $disabled = $disableEmailPrefs ? ' disabled="disabled"' : '';
                                $moreEmail =
-                               "<input type='checkbox' $emfc $disabled value='1' name='wpEmailFlag' id='wpEmailFlag' /> <label for='wpEmailFlag'>$emf</label>";
+                                       "<input type='checkbox' $emfc $disabled value='1' name='wpEmailFlag' id='wpEmailFlag' /> <label for='wpEmailFlag'>$emf</label>" .
+                                       $this->getToggle( 'ccmeonemails', '', $disableEmailPrefs );
                        }
 
 
@@ -752,8 +755,7 @@ class PreferencesForm {
                                        $enotifwatchlistpages.
                                        $enotifusertalkpages.
                                        $enotifminoredits.
-                                       $moreEmail.
-                                       $this->getToggle( 'ccmeonemails' )
+                                       $moreEmail
                                )
                        );
                }