sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support G shorthand for WP_MEMORY_LIMIT. see #23251.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@25685 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2013-10-03 03:46:01 +00:00
parent d4f0c8604a
commit 83a69a16d2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wp-includes/default-constants.php
View File

@ -44,8 +44,11 @@ function wp_initial_constants() {
$current_limit_int = intval( $current_limit ); $current_limit_int = intval( $current_limit );
if ( false !== stripos( $current_limit, 'G' ) ) if ( false !== stripos( $current_limit, 'G' ) )
$current_limit_int *= 1024; $current_limit_int *= 1024;
$wp_limit_int = intval( WP_MEMORY_LIMIT );
if ( false !== stripos( WP_MEMORY_LIMIT, 'G' ) )
$wp_limit_int *= 1024;
if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || ( $current_limit_int < abs( intval( WP_MEMORY_LIMIT ) ) ) ) ) if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || $current_limit_int < $wp_limit_int ) )
@ini_set( 'memory_limit', WP_MEMORY_LIMIT ); @ini_set( 'memory_limit', WP_MEMORY_LIMIT );
} }