From 525a9299cdceb1606bc9b833de70fc0753fe0d0b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 10 Dec 2008 20:01:38 +0000 Subject: [PATCH] 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. --- includes/specials/SpecialIpblocklist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' ) ); -- 2.20.1