From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 3 Jan 2011 03:40:26 +0000 (+0000)
Subject: Remove unreachable return;
X-Git-Tag: 1.31.0-rc.0~32869
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=da2c995df1da24faa15dc35b9aafc1448da7d482;p=lhc%2Fweb%2Fwiklou.git

Remove unreachable return;

Add missing global $IP;
---

diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index 12772a8914..dcd11747bd 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -26,11 +26,9 @@ class NewParserTest extends MediaWikiTestCase {
 	//PHPUnit + MediaWikiTestCase functions
 	
 	function setUp() {
-		global $wgContLang, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgNamespaceProtection, $wgNamespaceAliases;
+		global $wgContLang, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgNamespaceProtection, $wgNamespaceAliases, $IP;
 		$wgContLang = Language::factory( 'en' );
 		
-		
-		
 		//Setup CLI arguments
 		if ( $this->getCliArg( 'regex=' ) ) {
 			$this->regex = $this->getCliArg( 'regex=' );
@@ -536,7 +534,6 @@ class NewParserTest extends MediaWikiTestCase {
 					}
 					
 					throw new MWException( $ret );
-					return;
 				}
 			}