From 8cee2069c0b30811e3f80a67031a658bb3d2ceb6 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 7 May 2008 03:30:22 +0000
Subject: [PATCH] * (bug 13982) Disable ccmeonemails preference when
 user-to-user mails disabled

---
 RELEASE-NOTES                   | 2 ++
 includes/SpecialPreferences.php | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 69e7b4b2dd..8fe69127b1 100644
--- 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 76a16a9f2f..c9ab9a7ac4 100644
--- 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
 				)
 			);
 		}
-- 
2.20.1