From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 7 Jan 2016 18:52:01 +0000 (-0800)
Subject: registration: $wgRateLimits should be merged using array_plus_2d
X-Git-Tag: 1.31.0-rc.0~8407
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=f27f087fa7be8c267e472645812d141892ff5930;p=lhc%2Fweb%2Fwiklou.git

registration: $wgRateLimits should be merged using array_plus_2d

Change-Id: I0d1abbb251f4a6d126d58668d1281a6f1550b459
---

diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index aac0c79984..6ac25e8414 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -65,6 +65,7 @@ class ExtensionProcessor implements Processor {
 		'wgNamespaceContentModels' => 'array_plus',
 		'wgNamespaceProtection' => 'array_plus',
 		'wgCapitalLinkOverrides' => 'array_plus',
+		'wgRateLimits' => 'array_plus_2d',
 	);
 
 	/**