Merge "Improve "selfmove" message's wording"

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cf8e089..d462228 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -75,7 +75,7 @@ $wgConfigRegistry = [
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = '1.30.0-alpha';
+$wgVersion = '1.31.0-alpha';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php
@@ -1603,6 +1603,13 @@ $wgEnableEmail = true;
  */
 $wgEnableUserEmail = true;
 
+/**
+ * Set to true to enable user-to-user e-mail blacklist.
+ *
+ * @since 1.30
+ */
+$wgEnableUserEmailBlacklist = false;
+
 /**
  * If true put the sending user's email in a Reply-To header
  * instead of From (false). ($wgPasswordSender will be used as From.)
@@ -2973,46 +2980,9 @@ $wgAllUnicodeFixes = false;
 $wgLegacyEncoding = false;
 
 /**
- * Browser Blacklist for unicode non compliant browsers. Contains a list of
- * regexps : "/regexp/"  matching problematic browsers. These browsers will
- * be served encoded unicode in the edit box instead of real unicode.
+ * @deprecated since 1.30, does nothing
  */
-$wgBrowserBlackList = [
-       /**
-        * Netscape 2-4 detection
-        * The minor version may contain strings such as "Gold" or "SGoldC-SGI"
-        * Lots of non-netscape user agents have "compatible", so it's useful to check for that
-        * with a negative assertion. The [UIN] identifier specifies the level of security
-        * in a Netscape/Mozilla browser, checking for it rules out a number of fakers.
-        * The language string is unreliable, it is missing on NS4 Mac.
-        *
-        * Reference: http://www.psychedelix.com/agents/index.shtml
-        */
-       '/^Mozilla\/2\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
-       '/^Mozilla\/3\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
-       '/^Mozilla\/4\.[^ ]+ [^(]*?\((?!compatible).*; [UIN]/',
-
-       /**
-        * MSIE on Mac OS 9 is teh sux0r, converts þ to <thorn>, ð to <eth>,
-        * Þ to <THORN> and Ð to <ETH>
-        *
-        * Known useragents:
-        * - Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC)
-        * - Mozilla/4.0 (compatible; MSIE 5.15; Mac_PowerPC)
-        * - Mozilla/4.0 (compatible; MSIE 5.23; Mac_PowerPC)
-        * - [...]
-        *
-        * @link https://en.wikipedia.org/w/index.php?diff=12356041&oldid=12355864
-        * @link https://en.wikipedia.org/wiki/Template%3AOS9
-        */
-       '/^Mozilla\/4\.0 \(compatible; MSIE \d+\.\d+; Mac_PowerPC\)/',
-
-       /**
-        * Google wireless transcoder, seems to eat a lot of chars alive
-        * https://it.wikipedia.org/w/index.php?title=Luciano_Ligabue&diff=prev&oldid=8857361
-        */
-       '/^Mozilla\/4\.0 \(compatible; MSIE 6.0; Windows NT 5.0; Google Wireless Transcoder;\)/'
-];
+$wgBrowserBlackList = [];
 
 /**
  * If set to true, the MediaWiki 1.4 to 1.5 schema conversion will
@@ -3394,8 +3364,8 @@ $wgExperimentalHtmlIds = false;
 /**
  * How should section IDs be encoded?
  * This array can contain 1 or 2 elements, each of them can be one of:
- * - 'html5'  is modern HTML5 style encoding with minimal escaping. Allows to
- *            display Unicode characters in many browsers' address bars.
+ * - 'html5'  is modern HTML5 style encoding with minimal escaping. Displays Unicode
+ *            characters in most browsers' address bars.
  * - 'legacy' is old MediaWiki-style encoding, e.g. 啤酒 turns into .E5.95.A4.E9.85.92
  * - 'html5-legacy' corresponds to DEPRECATED $wgExperimentalHtmlIds mode. DO NOT use
  *            it for anything but migration off that mode (see below).
@@ -4920,6 +4890,7 @@ $wgDefaultUserOptions = [
        'previewontop' => 1,
        'rcdays' => 7,
        'rcenhancedfilters' => 0,
+       'rcenhancedfilters-disable' => 0,
        'rclimit' => 50,
        'rows' => 25, // @deprecated since 1.29 No longer used in core
        'showhiddencats' => 0,
@@ -6830,20 +6801,30 @@ $wgRCWatchCategoryMembership = false;
 $wgUseRCPatrol = true;
 
 /**
- * Whether to show the new experimental views (like namespaces, tags, and users) in
- * RecentChanges filters
+ * Whether a preference is displayed for structured change filters.
+ * If false, no preference is displayed and structured change filters are disabled.
+ * If true, structured change filters are *enabled* by default, and a preference is displayed
+ * that lets users disable them.
+ *
+ * Temporary variable during development and will be removed.
+ *
+ * @since 1.30
  */
-$wgStructuredChangeFiltersEnableExperimentalViews = false;
+$wgStructuredChangeFiltersShowPreference = false;
 
 /**
- * Whether to allow users to use the experimental live update feature in the new RecentChanges UI
+ * Whether to enable RCFilters app on Special:Watchlist
+ *
+ * Temporary variable during development and will be removed.
  */
-$wgStructuredChangeFiltersEnableLiveUpdate = false;
+$wgStructuredChangeFiltersOnWatchlist = false;
 
 /**
- * Whether to enable RCFilters app on Special:Watchlist
+ * Polling rate, in seconds, used by the 'live update' and 'view newest' features
+ * of the RCFilters app on SpecialRecentChanges and Special:Watchlist.
+ * 0 to disable completely.
  */
-$wgStructuredChangeFiltersOnWatchlist = false;
+$wgStructuredChangeFiltersLiveUpdatePollingRate = 3;
 
 /**
  * Use new page patrolling to check new pages on Special:Newpages