Fix missing if from $wgDBssl comment

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index dcbcb6e..6fe74fa 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -38,10 +38,6 @@
  * @file
  */
 
-/**
- * @defgroup Globalsettings Global settings
- */
-
 /**
  * @cond file_level_code
  * This is not a valid entry point, perform no further processing unless
@@ -1810,7 +1806,7 @@ $wgDBtype = 'mysql';
 /**
  * Whether to use SSL in DB connection.
  *
- * This setting is only used $wgLBFactoryConf['class'] is set to
+ * This setting is only used if $wgLBFactoryConf['class'] is set to
  * 'LBFactorySimple' and $wgDBservers is an empty array; otherwise
  * the DBO_SSL flag must be set in the 'flags' option of the database
  * connection to achieve the same functionality.
@@ -3685,23 +3681,6 @@ $wgResourceLoaderMaxage = [
  */
 $wgResourceLoaderDebug = false;
 
-/**
- * Put each statement on its own line when minifying JavaScript. This makes
- * debugging in non-debug mode a bit easier.
- *
- * @deprecated since 1.27: Always false; no longer configurable.
- */
-$wgResourceLoaderMinifierStatementsOnOwnLine = false;
-
-/**
- * Maximum line length when minifying JavaScript. This is not a hard maximum:
- * the minifier will try not to produce lines longer than this, but may be
- * forced to do so in certain cases.
- *
- * @deprecated since 1.27: Always 1,000; no longer configurable.
- */
-$wgResourceLoaderMinifierMaxLineLength = 1000;
-
 /**
  * Whether to ensure the mediawiki.legacy library is loaded before other modules.
  *
@@ -4852,6 +4831,7 @@ $wgReservedUsernames = [
        'msg:double-redirect-fixer', // Automatic double redirect fix
        'msg:usermessage-editor', // Default user for leaving user messages
        'msg:proxyblocker', // For $wgProxyList and Special:Blockme (removed in 1.22)
+       'msg:sorbs', // For $wgEnableDnsBlacklist etc.
        'msg:spambot_username', // Used by cleanupSpam.php
        'msg:autochange-username', // Used by anon category RC entries (parser functions, Lua & purges)
 ];
@@ -6962,6 +6942,29 @@ $wgAllowCategorizedRecentChanges = false;
  */
 $wgUseTagFilter = true;
 
+/**
+ * List of core tags to enable. Available tags are:
+ * - 'mw-contentmodelchange': Edit changes content model of a page
+ * - 'mw-new-redirect': Edit makes new redirect page (new page or by changing content page)
+ * - 'mw-removed-redirect': Edit changes an existing redirect into a non-redirect
+ * - 'mw-changed-redirect-target': Edit changes redirect target
+ * - 'mw-blank': Edit completely blanks the page
+ * - 'mw-replace': Edit removes more than 90% of the content
+ * - 'mw-rollback': Edit is a rollback, made through the rollback link or rollback API
+ *
+ * @var array
+ * @since 1.31
+ */
+$wgSoftwareTags = [
+       'mw-contentmodelchange' => true,
+       'mw-new-redirect' => true,
+       'mw-removed-redirect' => true,
+       'mw-changed-redirect-target' => true,
+       'mw-blank' => true,
+       'mw-replace' => true,
+       'mw-rollback' => true
+];
+
 /**
  * If set to an integer, pages that are watched by this many users or more
  * will not require the unwatchedpages permission to view the number of