Skip to content

Commit e353179

Browse files
dd32dd32
committed
Bootstrap: Revert [38399] as it's broken /build/ and subsequently core.svn.wordpress.org.
The generated classmaps reference `/src/` files and operates in the assumption that the base directory is one level above `wp-settings.php`, which it isn't after our build processes are run. See #36335 git-svn-id: https://develop.svn.wordpress.org/trunk@38402 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 68175f9 commit e353179

48 files changed

Lines changed: 385 additions & 40 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎composer.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/wp-admin/includes/admin.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
require_once(ABSPATH . 'wp-admin/includes/post.php');
5151

5252
/** WordPress Administration Screen API */
53+
require_once(ABSPATH . 'wp-admin/includes/class-wp-screen.php');
5354
require_once(ABSPATH . 'wp-admin/includes/screen.php');
5455

5556
/** WordPress Taxonomy Administration API */
@@ -59,6 +60,8 @@
5960
require_once(ABSPATH . 'wp-admin/includes/template.php');
6061

6162
/** WordPress List Table Administration API and base class */
63+
require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php');
64+
require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table-compat.php');
6265
require_once(ABSPATH . 'wp-admin/includes/list-table.php');
6366

6467
/** WordPress Theme Administration API */
@@ -67,6 +70,9 @@
6770
/** WordPress User Administration API */
6871
require_once(ABSPATH . 'wp-admin/includes/user.php');
6972

73+
/** WordPress Site Icon API */
74+
require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php');
75+
7076
/** WordPress Update Administration API */
7177
require_once(ABSPATH . 'wp-admin/includes/update.php');
7278

‎src/wp-admin/includes/ajax-actions.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,6 +1507,7 @@ function wp_ajax_wp_link_ajax() {
15071507

15081508
$args['pagenum'] = ! empty( $_POST['page'] ) ? absint( $_POST['page'] ) : 1;
15091509

1510+
require(ABSPATH . WPINC . '/class-wp-editor.php');
15101511
$results = _WP_Editors::wp_link_query( $args );
15111512

15121513
if ( ! isset( $results ) )
@@ -3136,6 +3137,7 @@ function wp_ajax_destroy_sessions() {
31363137
*/
31373138
function wp_ajax_press_this_save_post() {
31383139
if ( empty( $GLOBALS['wp_press_this'] ) ) {
3140+
include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
31393141
$GLOBALS['wp_press_this'] = new WP_Press_This();
31403142
}
31413143

@@ -3151,6 +3153,7 @@ function wp_ajax_press_this_save_post() {
31513153
*/
31523154
function wp_ajax_press_this_add_category() {
31533155
if ( empty( $GLOBALS['wp_press_this'] ) ) {
3156+
include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
31543157
$GLOBALS['wp_press_this'] = new WP_Press_This();
31553158
}
31563159

@@ -3180,6 +3183,7 @@ function wp_ajax_crop_image() {
31803183

31813184
switch ( $context ) {
31823185
case 'site-icon':
3186+
require_once ABSPATH . '/wp-admin/includes/class-wp-site-icon.php';
31833187
$wp_site_icon = new WP_Site_Icon();
31843188

31853189
// Skip creating a new attachment if the attachment is a Site Icon.
@@ -3328,6 +3332,7 @@ function wp_ajax_install_theme() {
33283332
wp_send_json_error( $status );
33293333
}
33303334

3335+
include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
33313336
include_once( ABSPATH . 'wp-admin/includes/theme.php' );
33323337

33333338
$api = themes_api( 'theme_information', array(
@@ -3434,6 +3439,8 @@ function wp_ajax_update_theme() {
34343439
wp_send_json_error( $status );
34353440
}
34363441

3442+
include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
3443+
34373444
$current = get_site_transient( 'update_themes' );
34383445
if ( empty( $current ) ) {
34393446
wp_update_themes();
@@ -3583,6 +3590,7 @@ function wp_ajax_install_plugin() {
35833590
wp_send_json_error( $status );
35843591
}
35853592

3593+
include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
35863594
include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
35873595

35883596
$api = plugins_api( 'plugin_information', array(
@@ -3690,6 +3698,8 @@ function wp_ajax_update_plugin() {
36903698
$status['oldVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
36913699
}
36923700

3701+
include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
3702+
36933703
wp_update_plugins();
36943704

36953705
$skin = new WP_Ajax_Upgrader_Skin();

‎src/wp-admin/includes/class-ftp.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -903,6 +903,8 @@ function PopError(){
903903
$mod_sockets = extension_loaded( 'sockets' );
904904
}
905905

906+
require_once dirname( __FILE__ ) . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";
907+
906908
if ( $mod_sockets ) {
907909
class ftp extends ftp_sockets {}
908910
} else {

‎src/wp-admin/includes/class-wp-filesystem-ftpsockets.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ public function __construct( $opt = '' ) {
3030
$this->method = 'ftpsockets';
3131
$this->errors = new WP_Error();
3232

33+
// Check if possible to use ftp functions.
34+
if ( ! @include_once( ABSPATH . 'wp-admin/includes/class-ftp.php' ) ) {
35+
return;
36+
}
3337
$this->ftp = new ftp();
3438

3539
if ( empty($opt['port']) )

‎src/wp-admin/includes/class-wp-upgrader.php‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,39 @@
99
* @since 2.8.0
1010
*/
1111

12+
/** WP_Upgrader_Skin class */
13+
require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader-skin.php';
14+
15+
/** Plugin_Upgrader_Skin class */
16+
require_once ABSPATH . 'wp-admin/includes/class-plugin-upgrader-skin.php';
17+
18+
/** Theme_Upgrader_Skin class */
19+
require_once ABSPATH . 'wp-admin/includes/class-theme-upgrader-skin.php';
20+
21+
/** Bulk_Upgrader_Skin class */
22+
require_once ABSPATH . 'wp-admin/includes/class-bulk-upgrader-skin.php';
23+
24+
/** Bulk_Plugin_Upgrader_Skin class */
25+
require_once ABSPATH . 'wp-admin/includes/class-bulk-plugin-upgrader-skin.php';
26+
27+
/** Bulk_Theme_Upgrader_Skin class */
28+
require_once ABSPATH . 'wp-admin/includes/class-bulk-theme-upgrader-skin.php';
29+
30+
/** Plugin_Installer_Skin class */
31+
require_once ABSPATH . 'wp-admin/includes/class-plugin-installer-skin.php';
32+
33+
/** Theme_Installer_Skin class */
34+
require_once ABSPATH . 'wp-admin/includes/class-theme-installer-skin.php';
35+
36+
/** Language_Pack_Upgrader_Skin class */
37+
require_once ABSPATH . 'wp-admin/includes/class-language-pack-upgrader-skin.php';
38+
39+
/** Automatic_Upgrader_Skin class */
40+
require_once ABSPATH . 'wp-admin/includes/class-automatic-upgrader-skin.php';
41+
42+
/** WP_Ajax_Upgrader_Skin class */
43+
require_once ABSPATH . 'wp-admin/includes/class-wp-ajax-upgrader-skin.php';
44+
1245
/**
1346
* Core class used for upgrading/installing a local set of files via
1447
* the Filesystem Abstraction classes from a Zip file.
@@ -854,3 +887,21 @@ public static function release_lock( $lock_name ) {
854887
}
855888

856889
}
890+
891+
/** Plugin_Upgrader class */
892+
require_once ABSPATH . 'wp-admin/includes/class-plugin-upgrader.php';
893+
894+
/** Theme_Upgrader class */
895+
require_once ABSPATH . 'wp-admin/includes/class-theme-upgrader.php';
896+
897+
/** Language_Pack_Upgrader class */
898+
require_once ABSPATH . 'wp-admin/includes/class-language-pack-upgrader.php';
899+
900+
/** Core_Upgrader class */
901+
require_once ABSPATH . 'wp-admin/includes/class-core-upgrader.php';
902+
903+
/** File_Upload_Upgrader class */
904+
require_once ABSPATH . 'wp-admin/includes/class-file-upload-upgrader.php';
905+
906+
/** WP_Automatic_Updater class */
907+
require_once ABSPATH . 'wp-admin/includes/class-wp-automatic-updater.php';

‎src/wp-admin/includes/deprecated.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,9 @@ function wp_tiny_mce( $teeny = false, $settings = false ) {
749749

750750
static $num = 1;
751751

752+
if ( ! class_exists( '_WP_Editors', false ) )
753+
require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
754+
752755
$editor_id = 'content' . $num++;
753756

754757
$set = array(
@@ -1141,6 +1144,7 @@ function wp_update_core($current, $feedback = '') {
11411144
if ( !empty($feedback) )
11421145
add_filter('update_feedback', $feedback);
11431146

1147+
include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
11441148
$upgrader = new Core_Upgrader();
11451149
return $upgrader->upgrade($current);
11461150

@@ -1163,6 +1167,7 @@ function wp_update_plugin($plugin, $feedback = '') {
11631167
if ( !empty($feedback) )
11641168
add_filter('update_feedback', $feedback);
11651169

1170+
include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
11661171
$upgrader = new Plugin_Upgrader();
11671172
return $upgrader->upgrade($plugin);
11681173
}
@@ -1184,6 +1189,7 @@ function wp_update_theme($theme, $feedback = '') {
11841189
if ( !empty($feedback) )
11851190
add_filter('update_feedback', $feedback);
11861191

1192+
include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
11871193
$upgrader = new Theme_Upgrader();
11881194
return $upgrader->upgrade($theme);
11891195
}

‎src/wp-admin/includes/file.php‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,8 @@ function _unzip_file_pclzip($file, $to, $needed_dirs = array()) {
737737

738738
mbstring_binary_safe_encoding();
739739

740+
require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
741+
740742
$archive = new PclZip($file);
741743

742744
$archive_files = $archive->extract(PCLZIP_OPT_EXTRACT_AS_STRING);
@@ -884,27 +886,14 @@ function copy_dir($from, $to, $skip_list = array() ) {
884886
function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_ownership = false ) {
885887
global $wp_filesystem;
886888

889+
require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
890+
887891
$method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
888892

889893
if ( ! $method )
890894
return false;
891895

892-
$map = array(
893-
'base' => 'WP_Filesystem_Base',
894-
'direct' => 'WP_Filesystem_Direct',
895-
'ftpext' => 'WP_Filesystem_FTPext',
896-
'ftpsockets' => 'WP_Filesystem_ftpsockets',
897-
'ssh2' => 'WP_Filesystem_SSH2',
898-
);
899-
900-
$l = strtolower( $method );
901-
if ( array_key_exists( $l, $map ) ) {
902-
$classname = $map[ $l ];
903-
} else {
904-
$classname = "WP_Filesystem_{$method}";
905-
}
906-
907-
if ( ! class_exists( $classname ) ) {
896+
if ( ! class_exists( "WP_Filesystem_$method" ) ) {
908897

909898
/**
910899
* Filters the path for a specific filesystem method class file.
@@ -918,14 +907,14 @@ function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_own
918907
*/
919908
$abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
920909

921-
if ( ! file_exists( $abstraction_file ) ) {
910+
if ( ! file_exists($abstraction_file) )
922911
return;
923-
}
924912

925-
require_once( $abstraction_file );
913+
require_once($abstraction_file);
926914
}
915+
$method = "WP_Filesystem_$method";
927916

928-
$wp_filesystem = new $classname( $args );
917+
$wp_filesystem = new $method($args);
929918

930919
//Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.
931920
if ( ! defined('FS_CONNECT_TIMEOUT') )

‎src/wp-admin/includes/list-table.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ function _get_list_table( $class, $args = array() ) {
4040
);
4141

4242
if ( isset( $core_classes[ $class ] ) ) {
43+
foreach ( (array) $core_classes[ $class ] as $required )
44+
require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
45+
4346
if ( isset( $args['screen'] ) )
4447
$args['screen'] = convert_to_screen( $args['screen'] );
4548
elseif ( isset( $GLOBALS['hook_suffix'] ) )

‎src/wp-admin/includes/nav-menu.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
* @since 3.0.0
88
*/
99

10+
/** Walker_Nav_Menu_Edit class */
11+
require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' );
12+
13+
/** Walker_Nav_Menu_Checklist class */
14+
require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php' );
15+
1016
/**
1117
* Prints the appropriate response to a menu quick search.
1218
*

0 commit comments

Comments
 (0)