Changeset 37207

Timestamp:

04/14/2016 05:52:02 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Bootstrap/Load: Allow for ABSPATH to be defined outside of wp-load.php, e.g. in a script loaded via auto_prepend_file.

Props barry.
Fixes #26592.

Location:

trunk/src

Files:

• wp-admin/load-scripts.php (modified) (1 diff)
• wp-admin/load-styles.php (modified) (1 diff)
• wp-admin/setup-config.php (modified) (1 diff)
• wp-load.php (modified) (1 diff)

trunk/src/wp-admin/load-scripts.php

@@ -9 +9 @@
 
 /** Set ABSPATH for execution */
-define( 'ABSPATH', dirname(dirname(__FILE__)) . '/' );
+if ( ! defined( 'ABSPATH' ) ) {
+    define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+}
+
 define( 'WPINC', 'wp-includes' );
 

trunk/src/wp-admin/load-styles.php

@@ -9 +9 @@
 
 /** Set ABSPATH for execution */
-define( 'ABSPATH', dirname(dirname(__FILE__)) . '/' );
+if ( ! defined( 'ABSPATH' ) ) {
+    define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+}
+
 define( 'WPINC', 'wp-includes' );
 

trunk/src/wp-admin/setup-config.php

@@ -29 +29 @@
 error_reporting(0);
 
-define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+if ( ! defined( 'ABSPATH' ) ) {
+    define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+}
 
 require( ABSPATH . 'wp-settings.php' );

trunk/src/wp-load.php

@@ -20 +20 @@
 
 /** Define ABSPATH as this file's directory */
-define( 'ABSPATH', dirname(__FILE__) . '/' );
+if ( ! defined( 'ABSPATH' ) ) {
+    define( 'ABSPATH', dirname( __FILE__ ) . '/' );
+}
 
 error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );