Changeset 53518

Timestamp:

06/17/2022 11:18:37 AM (2 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk/src

Files:

• index.php (modified) (1 diff)
• wp-includes/class-http.php (modified) (1 diff)
• wp-includes/class-oembed.php (modified) (1 diff)
• wp-includes/date.php (modified) (1 diff)
• wp-includes/embed-template.php (modified) (1 diff)

trunk/src/index.php

@@ -12 +12 @@
 }
 
-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';
 

trunk/src/wp-includes/class-http.php

@@ -9 +9 @@
  */
 
-_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';

trunk/src/wp-includes/class-oembed.php

@@ -10 +10 @@
  */
 
-_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';

trunk/src/wp-includes/date.php

@@ -9 +9 @@
  */
 
-_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';

trunk/src/wp-includes/embed-template.php

@@ -9 +9 @@
  */
 
-_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';