Index: trunk/phase3/includes/Setup.php |
— | — | @@ -238,6 +238,11 @@ |
239 | 239 | $wgHiddenPrefs[] = 'skin'; |
240 | 240 | } |
241 | 241 | |
| 242 | +# Doesn't make sense to have if disabled. |
| 243 | +if ( !$wgEnotifMinorEdits ) { |
| 244 | + $wgHiddenPrefs[] = 'enotifminoredits'; |
| 245 | +} |
| 246 | + |
242 | 247 | if ( !$wgHtml5Version && $wgHtml5 && $wgAllowRdfaAttributes ) { |
243 | 248 | # see http://www.w3.org/TR/rdfa-in-html/#document-conformance |
244 | 249 | if ( $wgMimeType == 'application/xhtml+xml' ) { |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -162,6 +162,7 @@ |
163 | 163 | * Trim the form field for uploading by url to remove extra spaces which could |
164 | 164 | cause confusing error messages. |
165 | 165 | * (bug 27854) Http::isValidURI is way too lax. |
| 166 | +* Do not show enotifminoredits preference, if disabled by $wgEnotifMinorEdits. |
166 | 167 | |
167 | 168 | === API changes in 1.18 === |
168 | 169 | * (bug 26339) Throw warning when truncating an overlarge API result |