From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 tests/phpunit/includes/cache/GenderCacheTest.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'tests/phpunit/includes/cache/GenderCacheTest.php')

diff --git a/tests/phpunit/includes/cache/GenderCacheTest.php b/tests/phpunit/includes/cache/GenderCacheTest.php
index ce2db5d7..04fb00d9 100644
--- a/tests/phpunit/includes/cache/GenderCacheTest.php
+++ b/tests/phpunit/includes/cache/GenderCacheTest.php
@@ -6,14 +6,10 @@
  */
 class GenderCacheTest extends MediaWikiLangTestCase {
 
-	protected function setUp() {
-		global $wgDefaultUserOptions;
-		parent::setUp();
+	function addDBData() {
 		//ensure the correct default gender
-		$wgDefaultUserOptions['gender'] = 'unknown';
-	}
+		$this->mergeMwGlobalArrayValue( 'wgDefaultUserOptions', array( 'gender' => 'unknown' ) );
 
-	function addDBData() {
 		$user = User::newFromName( 'UTMale' );
 		if ( $user->getID() == 0 ) {
 			$user->addToDatabase();
-- 
cgit v1.2.3-54-g00ecf