From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 24 Sep 2009 23:03:23 +0000 (+0000)
Subject: Set memory limit in finalSetup() to override what might have been set elsewhere
X-Git-Tag: 1.31.0-rc.0~39537
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=858e7d6611b0422f87b4629d33fa8ee30e44b9cc;p=lhc%2Fweb%2Fwiklou.git

Set memory limit in finalSetup() to override what might have been set elsewhere
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 27da73e02e..bcd2913a20 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -337,6 +337,7 @@ abstract class Maintenance {
 		}
 
 		# Set the memory limit
+		# Note we need to set it again later in cache LocalSettings changed it
 		ini_set( 'memory_limit', $this->memoryLimit() );
 
 		# Set max execution time to 0 (no limit). PHP.net says that
@@ -594,6 +595,7 @@ abstract class Maintenance {
 
 		$wgShowSQLErrors = true;
 		@set_time_limit( 0 );
+		ini_set( 'memory_limit', $this->memoryLimit() );
 
 		$wgProfiling = false; // only for Profiler.php mode; avoids OOM errors
 	}