From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 17 Dec 2010 15:43:16 +0000 (+0000)
Subject: Same as r78533, but 5 lines down
X-Git-Tag: 1.31.0-rc.0~33253
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=8bad04279a4f7783e7655d9837bbfb87dbbc9be8;p=lhc%2Fweb%2Fwiklou.git

Same as r78533, but 5 lines down
---

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 5b6254a7ec..24596eb4ee 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2414,12 +2414,8 @@ abstract class DatabaseBase implements DatabaseType {
 			$error = $this->sourceStream( $fp, $lineCallback, $resultCallback, $fname );
 		}
 		catch ( MWException $e ) {
-			if ( defined( "MEDIAWIKI_INSTALL" ) ) {
-				$error = $e->getMessage();
-			} else {
-				fclose( $fp );
-				throw $e;
-			}
+			fclose( $fp );
+			throw $e;
 		}
 
 		fclose( $fp );