(bug 19468) $wgEnotifWatchlist disabled, but option available on preferences
This commit is contained in:
parent
a1df5a8aa2
commit
c27ffd34fa
2 changed files with 31 additions and 22 deletions
|
|
@ -227,6 +227,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
|
|||
* (bug 19509) Uploading to a file named '0' previously treated it as null input
|
||||
and attempted to upload with the source name. Now warns about not having an
|
||||
extension (since 0.ext is perfectly valid)
|
||||
* (bug 19468) Enotif preferences are now only displayed when they are turned on
|
||||
|
||||
== API changes in 1.16 ==
|
||||
|
||||
|
|
|
|||
|
|
@ -355,28 +355,36 @@ class Preferences {
|
|||
'disabled' => $disableEmailPrefs,
|
||||
);
|
||||
}
|
||||
|
||||
$defaultPreferences['enotifwatchlistpages'] =
|
||||
array(
|
||||
'type' => 'toggle',
|
||||
'section' => 'personal/email',
|
||||
'label-message' => 'tog-enotifwatchlistpages',
|
||||
'disabled' => $disableEmailPrefs,
|
||||
);
|
||||
$defaultPreferences['enotifusertalkpages'] =
|
||||
array(
|
||||
'type' => 'toggle',
|
||||
'section' => 'personal/email',
|
||||
'label-message' => 'tog-enotifusertalkpages',
|
||||
'disabled' => $disableEmailPrefs,
|
||||
);
|
||||
$defaultPreferences['enotifminoredits'] =
|
||||
array(
|
||||
'type' => 'toggle',
|
||||
'section' => 'personal/email',
|
||||
'label-message' => 'tog-enotifminoredits',
|
||||
'disabled' => $disableEmailPrefs,
|
||||
);
|
||||
|
||||
global $wgEnotifWatchlist;
|
||||
if ( $wgEnotifWatchlist ) {
|
||||
$defaultPreferences['enotifwatchlistpages'] =
|
||||
array(
|
||||
'type' => 'toggle',
|
||||
'section' => 'personal/email',
|
||||
'label-message' => 'tog-enotifwatchlistpages',
|
||||
'disabled' => $disableEmailPrefs,
|
||||
);
|
||||
}
|
||||
global $wgEnotifUserTalk;
|
||||
if( $wgEnotifUserTalk ) {
|
||||
$defaultPreferences['enotifusertalkpages'] =
|
||||
array(
|
||||
'type' => 'toggle',
|
||||
'section' => 'personal/email',
|
||||
'label-message' => 'tog-enotifusertalkpages',
|
||||
'disabled' => $disableEmailPrefs,
|
||||
);
|
||||
}
|
||||
if( $wgEnotifUserTalk || $wgEnotifWatchlist ) {
|
||||
$defaultPreferences['enotifminoredits'] =
|
||||
array(
|
||||
'type' => 'toggle',
|
||||
'section' => 'personal/email',
|
||||
'label-message' => 'tog-enotifminoredits',
|
||||
'disabled' => $disableEmailPrefs,
|
||||
);
|
||||
}
|
||||
$defaultPreferences['enotifrevealaddr'] =
|
||||
array(
|
||||
'type' => 'toggle',
|
||||
|
|
|
|||
Loading…
Reference in a new issue