From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 7 Jul 2010 12:48:20 +0000 (+0000)
Subject: performInstallation() should halt when a fatal status is encountered
X-Git-Tag: 1.31.0-rc.0~36226
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22statistiques_visites%22%2C%22%22%29%20.%20%22?a=commitdiff_plain;h=93cfca41e544529e1a360f645cd2be852d5444a4;p=lhc%2Fweb%2Fwiklou.git

performInstallation() should halt when a fatal status is encountered
---

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 7a84488cfe..5efdc0c5ab 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -884,6 +884,11 @@ abstract class Installer {
 			}
 			call_user_func_array( $endCB, array( $step, $status ) );
 			$installResults[$step] = $status;
+
+			// If we've hit some sort of fatal, we need to bail. Callback
+			// already had a chance to do output above.
+			if( !$status->isOk() )
+				break;
 		}
 		return $installResults;
 	}