From: Benjamin Lees <emufarmers@users.mediawiki.org>
Date: Wed, 5 Aug 2009 00:59:50 +0000 (+0000)
Subject: Followup to r54406: enable/disable functions were being called in the wrong order... 
X-Git-Tag: 1.31.0-rc.0~40497
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=37a62ba6e134f9c65e3ed08c456bdb9a1dbd3f09;p=lhc%2Fweb%2Fwiklou.git

Followup to r54406: enable/disable functions were being called in the wrong order (thanks, OverlordQ).
---

diff --git a/includes/Setup.php b/includes/Setup.php
index e74e9cef27..88354c5ea8 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -155,9 +155,9 @@ $memlimit = ini_get( "memory_limit" );
 if( !( empty( $memlimit ) || $memlimit == -1 ) ) {
 	if( wfParseMemoryLimit( $memlimit ) < wfParseMemoryLimit( $wgMemoryLimit ) ) {
 		wfDebug( "\n\nRaise PHP's memory limit from $memlimit to $wgMemoryLimit\n" );
-		wfEnableWarnings();
-		ini_set( "memory_limit", $wgMemoryLimit );
 		wfDisableWarnings();
+		ini_set( "memory_limit", $wgMemoryLimit );
+		wfEnableWarnings();
 	}
 }