Merge "Remove these two rights autoreview and torunblocked from mediawiki"

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 4a9d802..2607797 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -567,10 +567,14 @@ $wgUploadDialog = [
                // * upload-form-label-not-own-work-local-generic-foreign
                'foreign' => 'generic-foreign',
        ],
-       // Upload comment to use. Available replacements:
+       // Upload comments to use for 'local' and 'foreign' uploads. This can also be set to a single
+       // string value, in which case it is used for both kinds of uploads. Available replacements:
        // * $HOST - domain name from which a cross-wiki upload originates
        // * $PAGENAME - wiki page name from which an upload originates
-       'comment' => '',
+       'comment' => [
+               'local' => '',
+               'foreign' => '',
+       ],
        // Format of the file page wikitext to be generated from the fields input by the user.
        'format' => [
                // Wrapper for the whole page. Available replacements:
@@ -2386,6 +2390,13 @@ $wgSessionHandler = null;
  */
 $wgPHPSessionHandling = 'enable';
 
+/**
+ * Number of internal PBKDF2 iterations to use when deriving session secrets.
+ *
+ * @since 1.28
+ */
+$wgSessionPbkdf2Iterations = 10001;
+
 /**
  * If enabled, will send MemCached debugging information to $wgDebugLogFile
  */
@@ -5969,6 +5980,12 @@ $wgTrxProfilerLimits = [
                'writes' => 0,
                'readQueryTime' => 5
        ],
+       // Deferred updates that run after HTTP response is sent
+       'PostSend' => [
+               'readQueryTime' => 5,
+               'writeQueryTime' => 1,
+               'maxAffected' => 500
+       ],
        // Background job runner
        'JobRunner' => [
                'readQueryTime' => 30,