From a0215f6e9d3dadb060131aac643459805327034d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 17 Jun 2022 11:20:13 +0000 Subject: [PATCH] General: Use `WPINC` as a shorter reference to `wp-includes` in some files. This brings more consistency with similar `require_once` statements and `_deprecated_file()` calls in other files. Follow-up to [601], [628], [36693], [44359], [45663], [45678], [52026], Props malthert. See #54233. Built from https://develop.svn.wordpress.org/trunk@53518 git-svn-id: http://core.svn.wordpress.org/trunk@53107 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-http.php | 4 ++-- wp-includes/class-oembed.php | 4 ++-- wp-includes/date.php | 4 ++-- wp-includes/embed-template.php | 2 +- wp-includes/version.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php index c9200be729..df43f11717 100644 --- a/wp-includes/class-http.php +++ b/wp-includes/class-http.php @@ -8,7 +8,7 @@ * @package WordPress */ -_deprecated_file( basename( __FILE__ ), '5.9.0', 'wp-includes/class-wp-http.php' ); +_deprecated_file( basename( __FILE__ ), '5.9.0', WPINC . '/class-wp-http.php' ); /** WP_Http class */ -require_once ABSPATH . 'wp-includes/class-wp-http.php'; +require_once ABSPATH . WPINC . '/class-wp-http.php'; diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php index 747fffa77a..c7ff40d1cc 100644 --- a/wp-includes/class-oembed.php +++ b/wp-includes/class-oembed.php @@ -9,7 +9,7 @@ * @subpackage oEmbed */ -_deprecated_file( basename( __FILE__ ), '5.3.0', 'wp-includes/class-wp-oembed.php' ); +_deprecated_file( basename( __FILE__ ), '5.3.0', WPINC . '/class-wp-oembed.php' ); /** WP_oEmbed class */ -require_once ABSPATH . 'wp-includes/class-wp-oembed.php'; +require_once ABSPATH . WPINC . '/class-wp-oembed.php'; diff --git a/wp-includes/date.php b/wp-includes/date.php index 26ffcb4513..425e72005f 100644 --- a/wp-includes/date.php +++ b/wp-includes/date.php @@ -8,7 +8,7 @@ * @package WordPress */ -_deprecated_file( basename( __FILE__ ), '5.3.0', 'wp-includes/class-wp-date-query.php' ); +_deprecated_file( basename( __FILE__ ), '5.3.0', WPINC . '/class-wp-date-query.php' ); /** WP_Date_Query class */ -require_once ABSPATH . 'wp-includes/class-wp-date-query.php'; +require_once ABSPATH . WPINC . '/class-wp-date-query.php'; diff --git a/wp-includes/embed-template.php b/wp-includes/embed-template.php index 88b94bf5f7..2f16843d86 100644 --- a/wp-includes/embed-template.php +++ b/wp-includes/embed-template.php @@ -8,6 +8,6 @@ * @deprecated 4.5.0 Moved to wp-includes/theme-compat/embed.php */ -_deprecated_file( basename( __FILE__ ), '4.5.0', 'wp-includes/theme-compat/embed.php' ); +_deprecated_file( basename( __FILE__ ), '4.5.0', WPINC . '/theme-compat/embed.php' ); require ABSPATH . WPINC . '/theme-compat/embed.php'; diff --git a/wp-includes/version.php b/wp-includes/version.php index a94d67ba58..9bb9478de9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-53517'; +$wp_version = '6.1-alpha-53518'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.