From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 28 May 2005 13:50:18 +0000 (+0000)
Subject: hide all enotif options when enotif is disabled
X-Git-Tag: 1.5.0alpha2~57
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=64f800a960852c31727b208be7fff905a7c94937;p=lhc%2Fweb%2Fwiklou.git

hide all enotif options when enotif is disabled
---

diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index a689052f40..79ced8e4c7 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -438,8 +438,8 @@ class PreferencesForm {
 
 		$enotifwatchlistpages = ($wgEnotifWatchlist) ? $this->getToggle( 'enotifwatchlistpages' ) : '';
 		$enotifusertalkpages = ($wgEnotifUserTalk) ? $this->getToggle( 'enotifusertalkpages' ) : '';
-		$enotifminoredits = ($wgEnotifMinorEdits) ? $this->getToggle( 'enotifminoredits' ) : '';
-		$enotifrevealaddr = ($wgEnotifRevealEditorAddress) ? $this->getToggle( 'enotifrevealaddr' ) : '';
+		$enotifminoredits = ($wgEnotifWatchlist && $wgEnotifMinorEdits) ? $this->getToggle( 'enotifminoredits' ) : '';
+		$enotifrevealaddr = (($wgEnotifWatchlist || $wgEnotifUserTalk) && $wgEnotifRevealEditorAddress) ? $this->getToggle( 'enotifrevealaddr' ) : '';
 		$prefs_help_email_enotif = ( $wgEnotifWatchlist || $wgEnotifUserTalk) ? ' ' . wfMsg('prefs-help-email-enotif') : '';
 		$prefs_help_realname = '';