From: Liangent <liangent@gmail.com>
Date: Tue, 18 Sep 2012 15:11:34 +0000 (+0800)
Subject: Fix Ibcb23c81, and tweak array merge order
X-Git-Tag: 1.31.0-rc.0~22080
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=d4305da200abe8a2b5fd13d6a5ab4e9e08ebdf48;p=lhc%2Fweb%2Fwiklou.git

Fix Ibcb23c81, and tweak array merge order

PS2 in Ibcb23c81 didn't do things correctly...

Change-Id: I6c1946b5a6ef1720767e236b419a3c5dd1332bf4
---

diff --git a/tests/phpunit/includes/specials/SpecialSearchTest.php b/tests/phpunit/includes/specials/SpecialSearchTest.php
index b2063ebdb8..3be92d5e26 100644
--- a/tests/phpunit/includes/specials/SpecialSearchTest.php
+++ b/tests/phpunit/includes/specials/SpecialSearchTest.php
@@ -80,17 +80,15 @@ class SpecialSearchTest extends MediaWikiTestCase {
 				'Web request with specific NS should override user preference'
 			),
 			array(
-				$EMPTY_REQUEST, array( 'searchNs2' => 1, 'searchNs14' => 1 ),
-				'advanced', array( 2, 14 ),
-				'Bug 33583: search with no option should honor User search preferences'
-			),
-			array(
-				$EMPTY_REQUEST, array_fill_keys( array_map( function( $ns ) {
+				$EMPTY_REQUEST, array(
+					'searchNs2' => 1,
+					'searchNs14' => 1,
+				) + array_fill_keys( array_map( function( $ns ) {
 					return "searchNs$ns";
-				}, $defaultNS ), 0 ) + array( 'searchNs2' => 1, 'searchNs14' => 1 ),
+				}, $defaultNS ), 0 ),
 				'advanced', array( 2, 14 ),
 				'Bug 33583: search with no option should honor User search preferences'
-				. 'and have all other namespace disabled'
+				. ' and have all other namespace disabled'
 			),
 		);
 	}