From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 10 Dec 2008 20:01:38 +0000 (+0000)
Subject: Fix regression in Special:Ipblocklist caused by r43047 -- options arrays in show... 
X-Git-Tag: 1.31.0-rc.0~44060
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=525a9299cdceb1606bc9b833de70fc0753fe0d0b;p=lhc%2Fweb%2Fwiklou.git

Fix regression in Special:Ipblocklist caused by r43047 -- options arrays in show/hide links broken by being merged in the wrong order when moved from wfArrayMerge() to "+" operator.
---

diff --git a/includes/specials/SpecialIpblocklist.php b/includes/specials/SpecialIpblocklist.php
index 1f21a11bfa..5ddb8d0bbc 100644
--- a/includes/specials/SpecialIpblocklist.php
+++ b/includes/specials/SpecialIpblocklist.php
@@ -354,7 +354,7 @@ class IPUnblockForm {
 	function makeOptionsLink( $title, $override, $options, $active = false ) {
 		global $wgUser;
 		$sk = $wgUser->getSkin();
-		$params = $options + $override;
+		$params = $override + $options;
 		$ipblocklist = SpecialPage::getTitleFor( 'IPBlockList' );
 		return $sk->link( $ipblocklist, htmlspecialchars( $title ),
 			( $active ? array( 'style'=>'font-weight: bold;' ) : array() ), $params, array( 'known' ) );