From 5485dfc217bfc13707c7531985d6713546215600 Mon Sep 17 00:00:00 2001
From: Benjamin Lees <emufarmers@users.mediawiki.org>
Date: Sat, 29 Aug 2009 07:40:18 +0000
Subject: [PATCH] Add set_time_limit( 0 ) to the installer; this should cut
 down on cases during installation where no user gets created, and during
 upgrades where people don't know that they might have to run the script
 several times.

---
 RELEASE-NOTES        | 1 +
 config/Installer.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f0384ef99e..d0a90abf97 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -437,6 +437,7 @@ this. Was used when mwEmbed was going to be an extension.
   if they contain non-ASCII characters
 * (bug 19055) maintenance/rebuildrecentchanges.php now purges
   Special:Recentchanges's RSS and Atom feed cache
+* The installer will now try to bypass PHP's max_execution_time
 
 == API changes in 1.16 ==
 
diff --git a/config/Installer.php b/config/Installer.php
index 6d54d866c6..eebc2f5b2f 100644
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -460,6 +460,11 @@ if( !function_exists( 'preg_match' ) )
 	dieout( "The PCRE support module appears to be missing. MediaWiki requires the
 	Perl-compatible regular expression functions." );
 
+# The installer can take a while, and we really don't want it to time out
+wfSuppressWarnings();
+set_time_limit( 0 );
+wfRestoreWarnings();
+
 $memlimit = ini_get( "memory_limit" );
 if( $memlimit == -1 ) {
 	print "<li>PHP is configured with no <tt>memory_limit</tt>.</li>\n";
-- 
2.20.1