Changeset 25684

Timestamp:

10/03/2013 03:27:04 AM (11 years ago)

Author:

nacin

Message:

Don't override a PHP memory_limit specified using G shorthand.

props peterjaap.
fixes #23251.

File:

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

trunk/src/wp-includes/default-constants.php

@@ -42 +42 @@
     if ( function_exists( 'memory_get_usage' ) ) {
         $current_limit = @ini_get( 'memory_limit' );
-        if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || ( intval( $current_limit ) < abs( intval( WP_MEMORY_LIMIT ) ) ) ) )
+        $current_limit_int = intval( $current_limit );
+        if ( false !== stripos( $current_limit, 'G' ) )
+            $current_limit_int *= 1024;
+
+        if ( -1 != $current_limit && ( -1 == WP_MEMORY_LIMIT || ( $current_limit_int < abs( intval( WP_MEMORY_LIMIT ) ) ) ) )
             @ini_set( 'memory_limit', WP_MEMORY_LIMIT );
     }