Merge "Support tighter rate limiting for "non-standard" thumbnails"

diff --combined includes/DefaultSettings.php
index c0c2e22,bdcee15..b6860b9
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -4076,6 -4076,7 +4076,6 @@@ $wgDefaultUserOptions = array
        'previewontop' => 1,
        'rcdays' => 7,
        'rclimit' => 50,
 -      'rememberpassword' => 0,
        'rows' => 25,
        'showhiddencats' => 0,
        'shownumberswatching' => 1,
@@@ -4771,6 -4772,13 +4771,13 @@@ $wgRateLimits = array
                'ip' => null,
                'subnet' => null,
        ),
+       'renderfile-nonstandard' => array( // same as above but for non-standard thumbnails
+               'anon' => null,
+               'user' => null,
+               'newbie' => null,
+               'ip' => null,
+               'subnet' => null,
+       ),
  );
  
  /**
@@@ -5979,13 -5987,13 +5986,13 @@@ $wgExtensionFunctions = array()
   *
   * Since MediaWiki 1.23, use of this variable to define messages is discouraged; instead, store
   * messages in JSON format and use $wgMessagesDirs. For setting other variables than
 - * $messages, $wgExtensionMessagesFiles should still be used.
 + * $messages, $wgExtensionMessagesFiles should still be used. Use a DIFFERENT key because
 + * any entry having a key that also exists in $wgMessagesDirs will be ignored.
   *
 - * If there is an entry in $wgMessagesDirs with the same key as one in
 - * $wgExtensionMessagesFiles, then any $messages variables set in the $wgExtensionMessagesFiles file
 - * will be ignored. This means an extension that only provides messages can be backwards compatible
 - * by using both $wgExtensionMessagesFiles and $wgMessagesDirs, and only one of the two
 - * will be used depending on what the version of MediaWiki supports.
 + * Extensions using the JSON message format can preserve backward compatibility with
 + * earlier versions of MediaWiki by using a compatibility shim, such as one generated
 + * by the generateJsonI18n.php maintenance script, listing it under the SAME key
 + * as for the $wgMessagesDirs entry.
   *
   * @par Example:
   * @code