From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 26 Jun 2005 09:33:51 +0000 (+0000)
Subject: * (bug 2520) Don't show enotif options when disabled
X-Git-Tag: 1.5.0beta1~1
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=ce7eaa15dcb28f38e07f92500e78bf9a49985808;p=lhc%2Fweb%2Fwiklou.git

* (bug 2520) Don't show enotif options when disabled
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3df597af26..0a7d90a0a9 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -344,6 +344,7 @@ Various bugfixes, small features, and a few experimental things:
 * Fix for interwiki link regression
 * Printable link shorter in monobook
 * Experimental Latin-1-and-replication-friendly upgrader script
+* (bug 2520) Don't show enotif options when disabled
 
 
 === Caveats ===
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 86da0b4b2b..bf6c200e57 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -420,7 +420,14 @@ class PreferencesForm {
 
 		$titleObj = Title::makeTitle( NS_SPECIAL, 'Preferences' );
 		$action = $titleObj->escapeLocalURL();
-
+		
+		# Pre-expire some toggles so they won't show if disabled
+		$this->mUsedToggles[ 'shownumberswatching' ] = true;
+		$this->mUsedToggles[ 'showupdated' ] = true;
+		$this->mUsedToggles[ 'enotifwatchlistpages' ] = true;
+		$this->mUsedToggles[ 'enotifusertalkpages' ] = true;
+		$this->mUsedToggles[ 'enotifminoredits' ] = true;
+		$this->mUsedToggles[ 'enotifrevealaddr' ] = true;
 
 		# Enotif
 		# <FIXME>