Fix regression in Special:Ipblocklist caused by r43047 -- options arrays in show...

diff --git a/includes/specials/SpecialIpblocklist.php b/includes/specials/SpecialIpblocklist.php
index 1f21a11..5ddb8d0 100644 (file)
--- 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' ) );