- $n = intval( $memlimit );
- if( preg_match( '/^([0-9]+)[Mm]$/', trim( $memlimit ), $m ) ) {
- $n = intval( $m[1] * (1024*1024) );
- }
- if( $n < 20*1024*1024 ) {
- print "Attempting to raise limit to 20M... ";
- if( false === ini_set( "memory_limit", "20M" ) ) {
+ global $wgMemoryLimit;
+ if( wfParseMemoryLimit( $memlimit ) < wfParseMemoryLimit( $wgMemoryLimit ) ) {
+ print "Attempting to raise limit to " . htmlspecialchars( $wgMemoryLimit ) . "... ";
+ if( false === ini_set( "memory_limit", $wgMemoryLimit ) ) {