Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2016-04-14 17:53:28 +00:00
parent acf69202a1
commit 4074bcc6a1
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/load-scripts.php
View File

@ -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'];

5
wp-admin/load-styles.php
View File

@ -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' );

4
wp-admin/setup-config.php
View File

@ -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' );

2
wp-includes/version.php
View File

@ -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.

4
wp-load.php
View File

@ -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 );