Changeset 21165

Timestamp:

06/28/2012 08:14:39 PM (12 years ago)

Author:

nacin

Message:

Respect -1 as a memory limit setting.

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

File:

• trunk/wp-includes/default-constants.php (modified) (1 diff)

trunk/wp-includes/default-constants.php

@@ -40 +40 @@
 
     // 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') )