From b3d0f35aee6f364000d12327247d2c18162492e8 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 27 Feb 2011 00:29:21 +0000
Subject: [PATCH] Remove unreachable return

Swap "dieout" for "die" in DatabaseMssql
---
 includes/Namespace.php        | 1 -
 includes/db/DatabaseMssql.php | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/includes/Namespace.php b/includes/Namespace.php
index c0df368630..95c58cccdb 100644
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -64,7 +64,6 @@ class MWNamespace {
 	private static function isMethodValidFor( $index, $method ) {
 		if( $index < NS_MAIN ) {
 			throw new MWException( "$method does not make any sense for given namespace $index" );
-			return false;
 		}
 		return true;
 	}
diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index c9fd1e4b60..015f5a0546 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -820,20 +820,20 @@ class DatabaseMssql extends DatabaseBase {
 		$res = $this->doQuery( $SQL );
 		if ( !$res ) {
 			print "<b>FAILED</b>. Make sure that the user " . htmlspecialchars( $wgDBuser ) . " can write to the database</li>\n";
-			dieout( );
+			die();
 		}
 		$this->doQuery( "DROP TABLE $ctest" );
 
 		$res = $this->sourceFile( "../maintenance/mssql/tables.sql" );
 		if ( $res !== true ) {
 			echo " <b>FAILED</b></li>";
-			dieout( htmlspecialchars( $res ) );
+			die( htmlspecialchars( $res ) );
 		}
 
 		# Avoid the non-standard "REPLACE INTO" syntax
 		$f = fopen( "../maintenance/interwiki.sql", 'r' );
 		if ( $f == false ) {
-			dieout( "<li>Could not find the interwiki.sql file" );
+			die( "<li>Could not find the interwiki.sql file" );
 		}
 		# We simply assume it is already empty as we have just created it
 		$SQL = "INSERT INTO interwiki(iw_prefix,iw_url,iw_local) VALUES ";
-- 
2.20.1