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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3df597a..0a7d90a 100644 (file)
--- 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 86da0b4..bf6c200 100644 (file)
--- 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>