From d39bc7e304bb86b4f803231198214f3117aa9a55 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Fri, 17 Jun 2022 11:18:37 +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.

git-svn-id: https://develop.svn.wordpress.org/trunk@53518 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/index.php                      | 5 +++--
 src/wp-includes/class-http.php     | 4 ++--
 src/wp-includes/class-oembed.php   | 4 ++--
 src/wp-includes/date.php           | 4 ++--
 src/wp-includes/embed-template.php | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/index.php b/src/index.php
index bb9757a487..6aa8789ea0 100644
--- a/src/index.php
+++ b/src/index.php
@@ -11,12 +11,13 @@ if ( ! defined( 'ABSPATH' ) ) {
 	define( 'ABSPATH', __DIR__ . '/' );
 }
 
-if ( file_exists( ABSPATH . 'wp-includes/js/dist/edit-post.js' ) ) {
+define( 'WPINC', 'wp-includes' );
+
+if ( file_exists( ABSPATH . WPINC .'/js/dist/edit-post.js' ) ) {
 	require_once ABSPATH . '_index.php';
 	return;
 }
 
-define( 'WPINC', 'wp-includes' );
 require_once ABSPATH . WPINC . '/load.php';
 
 // Standardize $_SERVER variables across setups.
diff --git a/src/wp-includes/class-http.php b/src/wp-includes/class-http.php
index c9200be729..df43f11717 100644
--- a/src/wp-includes/class-http.php
+++ b/src/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/src/wp-includes/class-oembed.php b/src/wp-includes/class-oembed.php
index 747fffa77a..c7ff40d1cc 100644
--- a/src/wp-includes/class-oembed.php
+++ b/src/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/src/wp-includes/date.php b/src/wp-includes/date.php
index 26ffcb4513..425e72005f 100644
--- a/src/wp-includes/date.php
+++ b/src/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/src/wp-includes/embed-template.php b/src/wp-includes/embed-template.php
index 88b94bf5f7..2f16843d86 100644
--- a/src/wp-includes/embed-template.php
+++ b/src/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';