From a64bf12b1bac07ca1fb70a13d422a15dab3c3d58 Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Fri, 8 Jul 2016 11:18:19 +0000 Subject: [PATCH] Constants: Move constants for data sizes before constants for memory limits. This allows us to improve core's memory limit handling. See #32075. git-svn-id: https://develop.svn.wordpress.org/trunk@38011 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/default-constants.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/wp-includes/default-constants.php b/src/wp-includes/default-constants.php index fe96e34bd1..1a80e2a6ab 100644 --- a/src/wp-includes/default-constants.php +++ b/src/wp-includes/default-constants.php @@ -17,6 +17,17 @@ function wp_initial_constants() { global $blog_id; + /**#@+ + * Constants for expressing human-readable data sizes in their respective number of bytes. + * + * @since 4.4.0 + */ + define( 'KB_IN_BYTES', 1024 ); + define( 'MB_IN_BYTES', 1024 * KB_IN_BYTES ); + define( 'GB_IN_BYTES', 1024 * MB_IN_BYTES ); + define( 'TB_IN_BYTES', 1024 * GB_IN_BYTES ); + /**#@-*/ + // set memory limits if ( !defined('WP_MEMORY_LIMIT') ) { if ( is_multisite() ) { @@ -110,17 +121,6 @@ function wp_initial_constants() { define( 'MONTH_IN_SECONDS', 30 * DAY_IN_SECONDS ); define( 'YEAR_IN_SECONDS', 365 * DAY_IN_SECONDS ); /**#@-*/ - - /**#@+ - * Constants for expressing human-readable data sizes in their respective number of bytes. - * - * @since 4.4.0 - */ - define( 'KB_IN_BYTES', 1024 ); - define( 'MB_IN_BYTES', 1024 * KB_IN_BYTES ); - define( 'GB_IN_BYTES', 1024 * MB_IN_BYTES ); - define( 'TB_IN_BYTES', 1024 * GB_IN_BYTES ); - /**#@-*/ } /**