Merge "Reject usernames with # as user-type API parameters"

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

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index facb92f..10e6adb 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -585,10 +585,9 @@ $wgLockManagers = [];
  * Requires PHP's Exif extension: http://www.php.net/manual/en/ref.exif.php
  *
  * @note FOR WINDOWS USERS:
- * To enable Exif functions, add the following lines to the "Windows
+ * To enable Exif functions, add the following line to the "Windows
  * extensions" section of php.ini:
  * @code{.ini}
- * extension=extensions/php_mbstring.dll
  * extension=extensions/php_exif.dll
  * @endcode
  */
@@ -2288,7 +2287,7 @@ $wgSessionsInObjectCache = true;
 $wgObjectCacheSessionExpiry = 3600;
 
 /**
- * @deprecated since 1.27, MediaWiki\\Session\\SessionManager doesn't use PHP session storage.
+ * @deprecated since 1.27, MediaWiki\Session\SessionManager doesn't use PHP session storage.
  */
 $wgSessionHandler = null;
 
@@ -4563,6 +4562,7 @@ $wgDefaultUserOptions = [
        'watchcreations' => 1,
        'watchdefault' => 1,
        'watchdeletion' => 0,
+       'watchuploads' => 1,
        'watchlistdays' => 3.0,
        'watchlisthideanons' => 0,
        'watchlisthidebots' => 0,
@@ -6886,6 +6886,21 @@ $wgAuth = null;
  */
 $wgHooks = [];
 
+/**
+ * List of service wiring files to be loaded by the default instance of MediaWikiServices.
+ * Each file listed here is expected to return an associative array mapping service names
+ * to instantiator functions. Extensions may add wiring files to define their own services.
+ * However, this cannot be used to replace existing services - use the MediaWikiServices
+ * hook for that.
+ *
+ * @see MediaWikiServices
+ * @see ServiceContainer::loadWiringFiles() for details on loading service instantiator functions.
+ * @see docs/injection.txt for an overview of dependency injection in MediaWiki.
+ */
+$wgServiceWiringFiles = [
+       __DIR__ . '/ServiceWiring.php'
+];
+
 /**
  * Maps jobs to their handling classes; extensions
  * can add to this to provide custom jobs
@@ -7225,12 +7240,36 @@ $wgActionFilteredLogs = [
                'reblock' => [ 'reblock' ],
                'unblock' => [ 'unblock' ],
        ],
+       'contentmodel' => [
+               'change' => [ 'change' ],
+               'new' => [ 'new' ],
+       ],
        'delete' => [
                'delete' => [ 'delete' ],
                'restore' => [ 'restore' ],
                'event' => [ 'event' ],
                'revision' => [ 'revision' ],
        ],
+       'import' => [
+               'interwiki' => [ 'interwiki' ],
+               'upload' => [ 'upload' ],
+       ],
+       'managetags' => [
+               'create' => [ 'create' ],
+               'delete' => [ 'delete' ],
+               'activate' => [ 'activate' ],
+               'deactivate' => [ 'deactivate' ],
+       ],
+       'move' => [
+               'move' => [ 'move' ],
+               'move_redir' => [ 'move_redir' ],
+       ],
+       'newusers' => [
+               'create' => [ 'create', 'newusers' ],
+               'create2' => ['create2' ],
+               'autocreate' => [ 'autocreate' ],
+               'byemail' => [ 'byemail' ],
+       ],
        'patrol' => [
                'patrol' => [ 'patrol' ],
                'autopatrol' => [ 'autopatrol' ],
@@ -7239,6 +7278,18 @@ $wgActionFilteredLogs = [
                'protect' => [ 'protect' ],
                'modify' => [ 'modify' ],
                'unprotect' => [ 'unprotect' ],
+               'move_prot' => ['move_prot'],
+       ],
+       'rights' => [
+               'rights' => [ 'rights' ],
+               'autopromote' => [ 'autopromote' ],
+       ],
+       'suppress' => [
+               'event' => [ 'event' ],
+               'revision' => [ 'revision' ],
+               'delete' => [ 'delete' ],
+               'block' => [ 'block' ],
+               'reblock' => [ 'reblock' ],
        ],
        'upload' => [
                'upload' => [ 'upload' ],