| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -748,12 +748,8 @@ |
| 749 | 749 | return true; |
| 750 | 750 | } |
| 751 | 751 | |
| 752 | | - $n = intval( $limit ); |
| | 752 | + $n = wfShorthandToInteger( $limit ); |
| 753 | 753 | |
| 754 | | - if( preg_match( '/^([0-9]+)[Mm]$/', trim( $limit ), $m ) ) { |
| 755 | | - $n = intval( $m[1] * ( 1024 * 1024 ) ); |
| 756 | | - } |
| 757 | | - |
| 758 | 754 | if( $n < $this->minMemorySize * 1024 * 1024 ) { |
| 759 | 755 | $newLimit = "{$this->minMemorySize}M"; |
| 760 | 756 | |