From 4074bcc6a11170b8183bef40fede0c7c133e155d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 14 Apr 2016 17:53:28 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@37207


git-svn-id: http://core.svn.wordpress.org/trunk@37173 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/load-scripts.php | 5 ++++-
 wp-admin/load-styles.php  | 5 ++++-
 wp-admin/setup-config.php | 4 +++-
 wp-includes/version.php   | 2 +-
 wp-load.php               | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/wp-admin/load-scripts.php b/wp-admin/load-scripts.php
index 011ae3c890..d536c1925a 100644
--- a/wp-admin/load-scripts.php
+++ b/wp-admin/load-scripts.php
@@ -8,7 +8,10 @@
 error_reporting(0);
 
 /** Set ABSPATH for execution */
-define( 'ABSPATH', dirname(dirname(__FILE__)) . '/' );
+if ( ! defined( 'ABSPATH' ) ) {
+	define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+}
+
 define( 'WPINC', 'wp-includes' );
 
 $load = $_GET['load'];
diff --git a/wp-admin/load-styles.php b/wp-admin/load-styles.php
index a461ae268d..de20881418 100644
--- a/wp-admin/load-styles.php
+++ b/wp-admin/load-styles.php
@@ -8,7 +8,10 @@
 error_reporting(0);
 
 /** Set ABSPATH for execution */
-define( 'ABSPATH', dirname(dirname(__FILE__)) . '/' );
+if ( ! defined( 'ABSPATH' ) ) {
+	define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+}
+
 define( 'WPINC', 'wp-includes' );
 
 require( ABSPATH . 'wp-admin/includes/noop.php' );
diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index befa6937ed..32c173df50 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -28,7 +28,9 @@ define('WP_SETUP_CONFIG', true);
  */
 error_reporting(0);
 
-define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+if ( ! defined( 'ABSPATH' ) ) {
+	define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+}
 
 require( ABSPATH . 'wp-settings.php' );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7340da94e0..cc7b81de34 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37206';
+$wp_version = '4.6-alpha-37207';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-load.php b/wp-load.php
index 94a8b541e7..76dda74b76 100644
--- a/wp-load.php
+++ b/wp-load.php
@@ -19,7 +19,9 @@
  */
 
 /** 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 );