If $wgEnotifMinorEdits=false, the enotifminoredits pref does nothing, so put it in...

Its confusing to have it as an option, if its disabled, especially since there is no indication to the
user that it is disabled.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index aeeb169..374917b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -162,6 +162,7 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * Trim the form field for uploading by url to remove extra spaces which could
   cause confusing error messages.
 * (bug 27854) Http::isValidURI is way too lax.
+* Do not show enotifminoredits preference, if disabled by $wgEnotifMinorEdits.
 
 === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result

diff --git a/includes/Setup.php b/includes/Setup.php
index 7dfe94b..9a217ed 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -238,6 +238,11 @@ if ( !$wgAllowUserSkin ) {
        $wgHiddenPrefs[] = 'skin';
 }
 
+# Doesn't make sense to have if disabled.
+if ( !$wgEnotifMinorEdits ) {
+       $wgHiddenPrefs[] = 'enotifminoredits';
+}
+
 if ( !$wgHtml5Version && $wgHtml5 && $wgAllowRdfaAttributes ) {
        # see http://www.w3.org/TR/rdfa-in-html/#document-conformance
        if ( $wgMimeType == 'application/xhtml+xml' ) {