Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 15:08:10 +01:00
Code Issues Projects Releases Wiki Activity

Respect -1 as a memory limit setting.

Browse Source 
Don't override memory_limit = -1 with a fixed value.
Know that WP_MEMORY_LIMIT = -1 can override a fixed value.

props aaroncampbell
fixes #14889



git-svn-id: http://core.svn.wordpress.org/trunk@21165 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-06-28 20:14:39 +00:00
parent a7249bfee8
commit cefb69254d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/default-constants.php
View File

@ -39,8 +39,11 @@ function wp_initial_constants( ) {
$blog_id = 1;
// set memory limits.
if ( function_exists('memory_get_usage') && ( (int) @ini_get('memory_limit') < abs(intval(WP_MEMORY_LIMIT)) ) )
@ini_set('memory_limit', WP_MEMORY_LIMIT);
if ( function_exists( 'memory_get_usage' ) ) {
$current_limit = @ini_get( 'memory_limit' );
if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || ( inval( $current_limit ) < abs( intval( WP_MEMORY_LIMIT ) ) ) ) )
@ini_set( 'memory_limit', WP_MEMORY_LIMIT );
}
if ( !defined('WP_CONTENT_DIR') )
define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down