memory_limit.diff
Public
Actions

Authored By

	• bzimport
	Nov 21 2014, 10:18 PM

Size

728 B

Referenced Files

None

Subscribers

None

memory_limit.diff
View Options

	Index: includes/GlobalFunctions.php
	===================================================================
	--- includes/GlobalFunctions.php (revision 54340)
	+++ includes/GlobalFunctions.php (working copy)
	@@ -3195,11 +3195,17 @@

	/* Parse PHP's silly format for memory limits */
	function wfParseMemoryLimit( $memlimit ) {
	- $n = intval( $memlimit );
	- if( preg_match( '/^([0-9]+)[Mm]$/', trim( $memlimit ), $m ) ) {
	- $n = intval( $m[1] * (1024*1024) );
	+ $last = strtolower($memlimit[strlen($memlimit)-1]);
	+ $val = intval( $memlimit );
	+ switch($last) {
	+ case 'g':
	+ $val *= 1024;
	+ case 'm':
	+ $val *= 1024;
	+ case 'k':
	+ $val *= 1024;
	}
	- return $n;
	+ return $val;
	}

	/* Get the normalised IETF language tag