Changeset 53579

Timestamp:

06/27/2022 10:18:44 AM (3 years ago)

Author:

SergeyBiryukov

Message:

General: Revert an earlier define of the WPINC constant in src/index.php.

This avoids a Constant WPINC already defined in src/wp-settings.php on line 16 PHP warning, which happens when running a WordPress install out of the src directory after npm run build:dev.

Add a comment to clarify the check for built assets and the direct mention of wp-includes.

Follow-up to [53518].

Props aristath.
See #54233.

File:

• trunk/src/index.php (modified) (1 diff)

trunk/src/index.php

@@ -12 +12 @@
 }
 
-define( 'WPINC', 'wp-includes' );
-
-if ( file_exists( ABSPATH . WPINC . '/js/dist/edit-post.js' ) ) {
+/*
+ * Load the actual index.php file if the assets were already built.
+ * Note: WPINC is not defined yet, it is defined later in wp-settings.php.
+ */
+if ( file_exists( ABSPATH . 'wp-includes/js/dist/edit-post.js' ) ) {
     require_once ABSPATH . '_index.php';
     return;
 }
 
+define( 'WPINC', 'wp-includes' );
 require_once ABSPATH . WPINC . '/load.php';