dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
df8eec9
)
Followup to r54406: enable/disable functions were being called in the wrong order...
author
Benjamin Lees
<emufarmers@users.mediawiki.org>
Wed, 5 Aug 2009 00:59:50 +0000
(
00:59
+0000)
committer
Benjamin Lees
<emufarmers@users.mediawiki.org>
Wed, 5 Aug 2009 00:59:50 +0000
(
00:59
+0000)
includes/Setup.php
patch
|
blob
|
history
diff --git
a/includes/Setup.php
b/includes/Setup.php
index
e74e9ce
..
88354c5
100644
(file)
--- 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();
}
}