Putting all the default user options together in the config

Also getting rid of $wgEchoDisableStandardEmail since it's no longer
used.

Change-Id: Ibdba2594695d607d1f932b741df8c2244dae834c
This commit is contained in:
Kaldari 2013-01-17 15:06:40 -08:00
parent 754bac1eca
commit dadd7b0076

View file

@ -159,10 +159,6 @@ $wgHooks['LinksUpdateAfterInsert'][] = 'EchoHooks::onLinksUpdateAfterInsert';
// Configuration
// Enable notifications for all logged in users by default
$wgDefaultUserOptions['echo-notify-link'] = 'true';
$wgEchoDisableStandardEmail = true;
// Whether to turn on email batch function
$wgEchoEnableEmailBatch = true;
@ -179,9 +175,6 @@ $wgEchoHelpPage = '//www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:Ec
// Todo - Abstract this into classes like: JobQueueNone, JobQueueMySQL, JobQueueRedis
$wgEchoUseJobQueue = false;
// By default, send emails for each notification as they come in
$wgDefaultUserOptions['echo-email-frequency'] = EchoHooks::EMAIL_IMMEDIATELY;
// The organization address, the value should be defined in LocalSettings.php
$wgEchoEmailFooterAddress = '';
@ -238,14 +231,6 @@ $wgEchoEventDetails = array(
),
);
// Set all of the events to email by default (won't affect events that don't email)
foreach ( $wgEchoEnabledEvents as $wgEchoEnabledEvent ) {
$wgDefaultUserOptions['echo-email-notifications' . $wgEchoEnabledEvent] = true;
}
// unset default email for reverted, article-linked (change them to opt-in)
$wgDefaultUserOptions['echo-email-notificationsreverted'] = false;
$wgDefaultUserOptions['echo-email-notificationsarticle-linked'] = false;
// Definitions of the notification event types built into Echo
$wgEchoNotificationFormatters = array(
'edit-user-talk' => array(
@ -316,3 +301,17 @@ $wgEchoNotificationFormatters = array(
'icon' => 'linked',
),
);
// Enable notifications for all logged in users by default
$wgDefaultUserOptions['echo-notify-link'] = 'true';
// By default, send emails for each notification as they come in
$wgDefaultUserOptions['echo-email-frequency'] = EchoHooks::EMAIL_IMMEDIATELY;
// Set all of the events to email by default (won't affect events that don't email)
foreach ( $wgEchoEnabledEvents as $wgEchoEnabledEvent ) {
$wgDefaultUserOptions['echo-email-notifications' . $wgEchoEnabledEvent] = true;
}
// unset default email for reverted, article-linked (change them to opt-in)
$wgDefaultUserOptions['echo-email-notificationsreverted'] = false;
$wgDefaultUserOptions['echo-email-notificationsarticle-linked'] = false;