Make preference "Email me when a page or file on my watchlist is changed" true by...

Consistent with the recent work in making vanilla MediaWiki closer to what a standard site
would do, with more obvious defaults, and bug 45020.

WMF can sort out its special problems separately and is not affected by this, see Iad6d13509.

Bug: 45022
Change-Id: I9757cff9728f377363c540b1ab809679a1bfa01d

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 0bb6bee..5331e00 100644 (file)
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -21,9 +21,10 @@ production.
 * $wgSquidServersNoPurge now supports the use of Classless Inter-Domain
   Routing (CIDR) notation to specify contiguous blocks of IPv4 and/or IPv6
   addresses that should be trusted to provide X-Forwarded-For headers.
-* Preferences 'watchcreations' and 'watchdefault' ("Add pages I create and files
-  I upload to my watchlist", "Add pages and files I edit to my watchlist") are
-  now enabled by default.
+* Preferences 'watchcreations', 'watchdefault', 'enotifwatchlistpages' ("Add
+  pages I create and files I upload to my watchlist", "Add pages and files I
+  edit to my watchlist", "Email me when a page or file on my watchlist is
+  changed") are now enabled by default.
 * $wgLBFactoryConf: Class names have had underscores removed. The configuration
   should be updated if LBFactory_Simple or LBFactory_Multi is configured.
 * $wgPasswordSenderName has been deprecated. To set a custom mailer name,

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9264947..2b05e1e 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3981,7 +3981,7 @@ $wgDefaultUserOptions = array(
        'enotifminoredits' => 0,
        'enotifrevealaddr' => 0,
        'enotifusertalkpages' => 1,
-       'enotifwatchlistpages' => 0,
+       'enotifwatchlistpages' => 1,
        'extendwatchlist' => 0,
        'fancysig' => 0,
        'forceeditsummary' => 0,