Changeset 25685 for trunk/src/wp-includes/default-constants.php

Timestamp:

10/03/2013 03:46:01 AM (11 years ago)

Author:

nacin

Message:

Support G shorthand for WP_MEMORY_LIMIT. see #23251.

File:

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

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

@@ -45 +45 @@
         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 ) ) ) ) )
+        $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 < $wp_limit_int ) )
             @ini_set( 'memory_limit', WP_MEMORY_LIMIT );
     }