Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Some tweaks to wfMemoryLimit() to make it a bit faster.

Browse source 
* Fixed inappropriate use of empty(), added "break missing" comments as in zend_atol()
This commit is contained in:
Tim Starling 2010-11-19 06:49:15 +00:00
parent a3ca8afa9f
commit 6dcca60f65
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
includes/GlobalFunctions.php
View file

@ -3451,8 +3451,8 @@ function wfObjectToArray( $object, $recursive = true ) {
function wfMemoryLimit() {
global $wgMemoryLimit;
$memlimit = wfShorthandToInteger( ini_get( 'memory_limit' ) );
$conflimit = wfShorthandToInteger( $wgMemoryLimit );
if( $memlimit != -1 ) {
$conflimit = wfShorthandToInteger( $wgMemoryLimit );
if( $conflimit == -1 ) {
wfDebug( "Removing PHP's memory limit\n" );
wfSuppressWarnings();
@ -3477,17 +3477,22 @@ function wfMemoryLimit() {
*/
function wfShorthandToInteger( $string = '' ) {
$string = trim( $string );
if( empty( $string ) ) {
if( $string === '' ) {
return -1;
}
$last = strtolower( $string[strlen( $string ) - 1] );
$last = $string[strlen( $string ) - 1];
$val = intval( $string );
switch( $last ) {
case 'g':
case 'G':
$val *= 1024;
// break intentionally missing
case 'm':
case 'M':
$val *= 1024;
// break intentionally missing
case 'k':
case 'K':
$val *= 1024;
}