From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 21 Apr 2005 23:19:02 +0000 (+0000)
Subject: Don't hide email notification preferences when user-to-user email is disabled
X-Git-Tag: 1.5.0alpha1~189
X-Git-Url: http://git.cyclocoop.org/geomaker.php?a=commitdiff_plain;h=f0a74d9b69b4cfc811c430af4725c2213b208f66;p=lhc%2Fweb%2Fwiklou.git

Don't hide email notification preferences when user-to-user email is disabled
---

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index b4e91e422e..b608222ab8 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -489,13 +489,14 @@ class PreferencesForm {
 		if( $wgEnableEmail ) {
 			$wgOut->addHTML("
 			<div><label>$yem: <input type='text' name=\"wpUserEmail\" value=\"{$this->mUserEmail}\" size='20' /></label></div>" );
-			if( $wgEnableUserEmail ) {
-				$wgOut->addHTML(
+			$wgOut->addHTML(
 				$emailauthenticated.
 				$enotifrevealaddr.
 				$enotifwatchlistpages.
 				$enotifusertalkpages.
-				$enotifminoredits.
+				$enotifminoredits );
+			if( $wgEnableUserEmail ) {
+				$wgOut->addHTML(
 				"<div><label><input type='checkbox' $emfc value=\"1\" name=\"wpEmailFlag\" />$emf.$disabled</label></div>" );
 			}
 		}