diff -r c7c34916027a -r 177826044cd9 wp/wp-includes/default-constants.php --- a/wp/wp-includes/default-constants.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-includes/default-constants.php Mon Oct 14 18:28:13 2019 +0200 @@ -29,6 +29,11 @@ define( 'TB_IN_BYTES', 1024 * GB_IN_BYTES ); /**#@-*/ + // Start of run timestamp. + if ( ! defined( 'WP_START_TIMESTAMP' ) ) { + define( 'WP_START_TIMESTAMP', microtime( true ) ); + } + $current_limit = @ini_get( 'memory_limit' ); $current_limit_int = wp_convert_hr_to_bytes( $current_limit ); @@ -59,29 +64,35 @@ @ini_set( 'memory_limit', WP_MEMORY_LIMIT ); } - if ( ! isset($blog_id) ) + if ( ! isset( $blog_id ) ) { $blog_id = 1; - - 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 + } - // Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development. - if ( !defined('WP_DEBUG') ) + 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 + } + + // Add define( 'WP_DEBUG', true ); to wp-config.php to enable display of notices during development. + if ( ! defined( 'WP_DEBUG' ) ) { define( 'WP_DEBUG', false ); + } - // Add define('WP_DEBUG_DISPLAY', null); to wp-config.php use the globally configured setting for + // Add define( 'WP_DEBUG_DISPLAY', null ); to wp-config.php use the globally configured setting for // display_errors and not force errors to be displayed. Use false to force display_errors off. - if ( !defined('WP_DEBUG_DISPLAY') ) + if ( ! defined( 'WP_DEBUG_DISPLAY' ) ) { define( 'WP_DEBUG_DISPLAY', true ); + } - // Add define('WP_DEBUG_LOG', true); to enable error logging to wp-content/debug.log. - if ( !defined('WP_DEBUG_LOG') ) - define('WP_DEBUG_LOG', false); + // Add define( 'WP_DEBUG_LOG', true ); to enable error logging to wp-content/debug.log. + if ( ! defined( 'WP_DEBUG_LOG' ) ) { + define( 'WP_DEBUG_LOG', false ); + } - if ( !defined('WP_CACHE') ) - define('WP_CACHE', false); + if ( ! defined( 'WP_CACHE' ) ) { + define( 'WP_CACHE', false ); + } - // Add define('SCRIPT_DEBUG', true); to wp-config.php to enable loading of non-minified, + // Add define( 'SCRIPT_DEBUG', true ); to wp-config.php to enable loading of non-minified, // non-concatenated scripts and stylesheets. if ( ! defined( 'SCRIPT_DEBUG' ) ) { if ( ! empty( $GLOBALS['wp_version'] ) ) { @@ -96,11 +107,13 @@ /** * Private */ - if ( !defined('MEDIA_TRASH') ) - define('MEDIA_TRASH', false); + if ( ! defined( 'MEDIA_TRASH' ) ) { + define( 'MEDIA_TRASH', false ); + } - if ( !defined('SHORTINIT') ) - define('SHORTINIT', false); + if ( ! defined( 'SHORTINIT' ) ) { + define( 'SHORTINIT', false ); + } // Constants for features added to WP that should short-circuit their plugin implementations define( 'WP_FEATURE_BETTER_PASSWORDS', true ); @@ -119,11 +132,11 @@ * @since 4.4.0 Introduced `MONTH_IN_SECONDS`. */ define( 'MINUTE_IN_SECONDS', 60 ); - define( 'HOUR_IN_SECONDS', 60 * MINUTE_IN_SECONDS ); - define( 'DAY_IN_SECONDS', 24 * HOUR_IN_SECONDS ); - define( 'WEEK_IN_SECONDS', 7 * DAY_IN_SECONDS ); - define( 'MONTH_IN_SECONDS', 30 * DAY_IN_SECONDS ); - define( 'YEAR_IN_SECONDS', 365 * DAY_IN_SECONDS ); + define( 'HOUR_IN_SECONDS', 60 * MINUTE_IN_SECONDS ); + define( 'DAY_IN_SECONDS', 24 * HOUR_IN_SECONDS ); + define( 'WEEK_IN_SECONDS', 7 * DAY_IN_SECONDS ); + define( 'MONTH_IN_SECONDS', 30 * DAY_IN_SECONDS ); + define( 'YEAR_IN_SECONDS', 365 * DAY_IN_SECONDS ); /**#@-*/ } @@ -135,24 +148,27 @@ * @since 3.0.0 */ function wp_plugin_directory_constants() { - if ( !defined('WP_CONTENT_URL') ) - define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up + if ( ! defined( 'WP_CONTENT_URL' ) ) { + define( 'WP_CONTENT_URL', get_option( 'siteurl' ) . '/wp-content' ); // full url - WP_CONTENT_DIR is defined further up + } /** * Allows for the plugins directory to be moved from the default location. * * @since 2.6.0 */ - if ( !defined('WP_PLUGIN_DIR') ) + if ( ! defined( 'WP_PLUGIN_DIR' ) ) { define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash + } /** * Allows for the plugins directory to be moved from the default location. * * @since 2.6.0 */ - if ( !defined('WP_PLUGIN_URL') ) + if ( ! defined( 'WP_PLUGIN_URL' ) ) { define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash + } /** * Allows for the plugins directory to be moved from the default location. @@ -160,24 +176,27 @@ * @since 2.1.0 * @deprecated */ - if ( !defined('PLUGINDIR') ) + if ( ! defined( 'PLUGINDIR' ) ) { define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat. + } /** * Allows for the mu-plugins directory to be moved from the default location. * * @since 2.8.0 */ - if ( !defined('WPMU_PLUGIN_DIR') ) + if ( ! defined( 'WPMU_PLUGIN_DIR' ) ) { define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' ); // full path, no trailing slash + } /** * Allows for the mu-plugins directory to be moved from the default location. * * @since 2.8.0 */ - if ( !defined('WPMU_PLUGIN_URL') ) + if ( ! defined( 'WPMU_PLUGIN_URL' ) ) { define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' ); // full url, no trailing slash + } /** * Allows for the mu-plugins directory to be moved from the default location. @@ -185,14 +204,16 @@ * @since 2.8.0 * @deprecated */ - if ( !defined( 'MUPLUGINDIR' ) ) + if ( ! defined( 'MUPLUGINDIR' ) ) { define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat. + } } /** * Defines cookie related WordPress constants * * Defines constants after multisite is loaded. + * * @since 3.0.0 */ function wp_cookie_constants() { @@ -201,83 +222,102 @@ * * @since 1.5.0 */ - if ( !defined( 'COOKIEHASH' ) ) { + if ( ! defined( 'COOKIEHASH' ) ) { $siteurl = get_site_option( 'siteurl' ); - if ( $siteurl ) + if ( $siteurl ) { define( 'COOKIEHASH', md5( $siteurl ) ); - else + } else { define( 'COOKIEHASH', '' ); + } + } + + /** + * @since 2.0.0 + */ + if ( ! defined( 'USER_COOKIE' ) ) { + define( 'USER_COOKIE', 'wordpressuser_' . COOKIEHASH ); } /** * @since 2.0.0 */ - if ( !defined('USER_COOKIE') ) - define('USER_COOKIE', 'wordpressuser_' . COOKIEHASH); - - /** - * @since 2.0.0 - */ - if ( !defined('PASS_COOKIE') ) - define('PASS_COOKIE', 'wordpresspass_' . COOKIEHASH); + if ( ! defined( 'PASS_COOKIE' ) ) { + define( 'PASS_COOKIE', 'wordpresspass_' . COOKIEHASH ); + } /** * @since 2.5.0 */ - if ( !defined('AUTH_COOKIE') ) - define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH); + if ( ! defined( 'AUTH_COOKIE' ) ) { + define( 'AUTH_COOKIE', 'wordpress_' . COOKIEHASH ); + } /** * @since 2.6.0 */ - if ( !defined('SECURE_AUTH_COOKIE') ) - define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH); + if ( ! defined( 'SECURE_AUTH_COOKIE' ) ) { + define( 'SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH ); + } /** * @since 2.6.0 */ - if ( !defined('LOGGED_IN_COOKIE') ) - define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH); + if ( ! defined( 'LOGGED_IN_COOKIE' ) ) { + define( 'LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH ); + } /** * @since 2.3.0 */ - if ( !defined('TEST_COOKIE') ) - define('TEST_COOKIE', 'wordpress_test_cookie'); + if ( ! defined( 'TEST_COOKIE' ) ) { + define( 'TEST_COOKIE', 'wordpress_test_cookie' ); + } /** * @since 1.2.0 */ - if ( !defined('COOKIEPATH') ) - define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) ); + if ( ! defined( 'COOKIEPATH' ) ) { + define( 'COOKIEPATH', preg_replace( '|https?://[^/]+|i', '', get_option( 'home' ) . '/' ) ); + } /** * @since 1.5.0 */ - if ( !defined('SITECOOKIEPATH') ) - define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) ); + if ( ! defined( 'SITECOOKIEPATH' ) ) { + define( 'SITECOOKIEPATH', preg_replace( '|https?://[^/]+|i', '', get_option( 'siteurl' ) . '/' ) ); + } /** * @since 2.6.0 */ - if ( !defined('ADMIN_COOKIE_PATH') ) + if ( ! defined( 'ADMIN_COOKIE_PATH' ) ) { define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' ); + } /** * @since 2.6.0 */ - if ( !defined('PLUGINS_COOKIE_PATH') ) - define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL) ); + if ( ! defined( 'PLUGINS_COOKIE_PATH' ) ) { + define( 'PLUGINS_COOKIE_PATH', preg_replace( '|https?://[^/]+|i', '', WP_PLUGIN_URL ) ); + } /** * @since 2.0.0 */ - if ( !defined('COOKIE_DOMAIN') ) - define('COOKIE_DOMAIN', false); + if ( ! defined( 'COOKIE_DOMAIN' ) ) { + define( 'COOKIE_DOMAIN', false ); + } + + if ( ! defined( 'RECOVERY_MODE_COOKIE' ) ) { + /** + * @since 5.2.0 + */ + define( 'RECOVERY_MODE_COOKIE', 'wordpress_rec_' . COOKIEHASH ); + } } /** - * Defines cookie related WordPress constants + * Defines SSL-related WordPress constants. * * @since 3.0.0 */ @@ -285,7 +325,7 @@ /** * @since 2.6.0 */ - if ( !defined( 'FORCE_SSL_ADMIN' ) ) { + if ( ! defined( 'FORCE_SSL_ADMIN' ) ) { if ( 'https' === parse_url( get_option( 'siteurl' ), PHP_URL_SCHEME ) ) { define( 'FORCE_SSL_ADMIN', true ); } else { @@ -312,23 +352,27 @@ /** * @since 2.5.0 */ - if ( !defined( 'AUTOSAVE_INTERVAL' ) ) + if ( ! defined( 'AUTOSAVE_INTERVAL' ) ) { define( 'AUTOSAVE_INTERVAL', 60 ); + } /** * @since 2.9.0 */ - if ( !defined( 'EMPTY_TRASH_DAYS' ) ) + if ( ! defined( 'EMPTY_TRASH_DAYS' ) ) { define( 'EMPTY_TRASH_DAYS', 30 ); + } - if ( !defined('WP_POST_REVISIONS') ) - define('WP_POST_REVISIONS', true); + if ( ! defined( 'WP_POST_REVISIONS' ) ) { + define( 'WP_POST_REVISIONS', true ); + } /** * @since 3.3.0 */ - if ( !defined( 'WP_CRON_LOCK_TIMEOUT' ) ) - define('WP_CRON_LOCK_TIMEOUT', 60); // In seconds + if ( ! defined( 'WP_CRON_LOCK_TIMEOUT' ) ) { + define( 'WP_CRON_LOCK_TIMEOUT', 60 ); // In seconds + } } /** @@ -339,15 +383,17 @@ function wp_templating_constants() { /** * Filesystem path to the current active template directory + * * @since 1.5.0 */ - define('TEMPLATEPATH', get_template_directory()); + define( 'TEMPLATEPATH', get_template_directory() ); /** * Filesystem path to the current active template stylesheet directory + * * @since 2.1.0 */ - define('STYLESHEETPATH', get_stylesheet_directory()); + define( 'STYLESHEETPATH', get_stylesheet_directory() ); /** * Slug of the default theme for this installation. @@ -357,7 +403,8 @@ * @since 3.0.0 * @see WP_Theme::get_core_default_theme() */ - if ( !defined('WP_DEFAULT_THEME') ) - define( 'WP_DEFAULT_THEME', 'twentyseventeen' ); + if ( ! defined( 'WP_DEFAULT_THEME' ) ) { + define( 'WP_DEFAULT_THEME', 'twentynineteen' ); + } }