Skip to content

Commit 4225e71

Browse files
staylorstaylor
committed
Bootstrap: after r38409 and r38410, revert r38402 which reverted r38399.
This fixes the paths in `wp-vendor/` that were including `src`. I want to drop this in so we can find out what else will break. See #36335. git-svn-id: https://develop.svn.wordpress.org/trunk@38411 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 06b6097 commit 4225e71

47 files changed

Lines changed: 39 additions & 384 deletions

Some content is hidden

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

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
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');
5453
require_once(ABSPATH . 'wp-admin/includes/screen.php');
5554

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

6261
/** 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');
6562
require_once(ABSPATH . 'wp-admin/includes/list-table.php');
6663

6764
/** WordPress Theme Administration API */
@@ -70,9 +67,6 @@
7067
/** WordPress User Administration API */
7168
require_once(ABSPATH . 'wp-admin/includes/user.php');
7269

73-
/** WordPress Site Icon API */
74-
require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php');
75-
7670
/** WordPress Update Administration API */
7771
require_once(ABSPATH . 'wp-admin/includes/update.php');
7872

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,6 @@ 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');
15111510
$results = _WP_Editors::wp_link_query( $args );
15121511

15131512
if ( ! isset( $results ) )
@@ -3137,7 +3136,6 @@ function wp_ajax_destroy_sessions() {
31373136
*/
31383137
function wp_ajax_press_this_save_post() {
31393138
if ( empty( $GLOBALS['wp_press_this'] ) ) {
3140-
include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
31413139
$GLOBALS['wp_press_this'] = new WP_Press_This();
31423140
}
31433141

@@ -3153,7 +3151,6 @@ function wp_ajax_press_this_save_post() {
31533151
*/
31543152
function wp_ajax_press_this_add_category() {
31553153
if ( empty( $GLOBALS['wp_press_this'] ) ) {
3156-
include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
31573154
$GLOBALS['wp_press_this'] = new WP_Press_This();
31583155
}
31593156

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

31843181
switch ( $context ) {
31853182
case 'site-icon':
3186-
require_once ABSPATH . '/wp-admin/includes/class-wp-site-icon.php';
31873183
$wp_site_icon = new WP_Site_Icon();
31883184

31893185
// Skip creating a new attachment if the attachment is a Site Icon.
@@ -3332,7 +3328,6 @@ function wp_ajax_install_theme() {
33323328
wp_send_json_error( $status );
33333329
}
33343330

3335-
include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
33363331
include_once( ABSPATH . 'wp-admin/includes/theme.php' );
33373332

33383333
$api = themes_api( 'theme_information', array(
@@ -3439,8 +3434,6 @@ function wp_ajax_update_theme() {
34393434
wp_send_json_error( $status );
34403435
}
34413436

3442-
include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
3443-
34443437
$current = get_site_transient( 'update_themes' );
34453438
if ( empty( $current ) ) {
34463439
wp_update_themes();
@@ -3590,7 +3583,6 @@ function wp_ajax_install_plugin() {
35903583
wp_send_json_error( $status );
35913584
}
35923585

3593-
include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
35943586
include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
35953587

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

3701-
include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
3702-
37033693
wp_update_plugins();
37043694

37053695
$skin = new WP_Ajax_Upgrader_Skin();

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

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

906-
require_once dirname( __FILE__ ) . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";
907-
908906
if ( $mod_sockets ) {
909907
class ftp extends ftp_sockets {}
910908
} else {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ 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-
}
3733
$this->ftp = new ftp();
3834

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

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

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,6 @@
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-
4512
/**
4613
* Core class used for upgrading/installing a local set of files via
4714
* the Filesystem Abstraction classes from a Zip file.
@@ -887,21 +854,3 @@ public static function release_lock( $lock_name ) {
887854
}
888855

889856
}
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: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -749,9 +749,6 @@ 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-
755752
$editor_id = 'content' . $num++;
756753

757754
$set = array(
@@ -1144,7 +1141,6 @@ function wp_update_core($current, $feedback = '') {
11441141
if ( !empty($feedback) )
11451142
add_filter('update_feedback', $feedback);
11461143

1147-
include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
11481144
$upgrader = new Core_Upgrader();
11491145
return $upgrader->upgrade($current);
11501146

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

1170-
include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
11711166
$upgrader = new Plugin_Upgrader();
11721167
return $upgrader->upgrade($plugin);
11731168
}
@@ -1189,7 +1184,6 @@ function wp_update_theme($theme, $feedback = '') {
11891184
if ( !empty($feedback) )
11901185
add_filter('update_feedback', $feedback);
11911186

1192-
include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
11931187
$upgrader = new Theme_Upgrader();
11941188
return $upgrader->upgrade($theme);
11951189
}

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

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -737,8 +737,6 @@ 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-
742740
$archive = new PclZip($file);
743741

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

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

893889
if ( ! $method )
894890
return false;
895891

896-
if ( ! class_exists( "WP_Filesystem_$method" ) ) {
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 ) ) {
897908

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

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

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

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

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

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ 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-
4643
if ( isset( $args['screen'] ) )
4744
$args['screen'] = convert_to_screen( $args['screen'] );
4845
elseif ( isset( $GLOBALS['hook_suffix'] ) )

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
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-
1610
/**
1711
* Prints the appropriate response to a menu quick search.
1812
*

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88
* @subpackage Administration
99
*/
1010

11-
/** Walker_Category_Checklist class */
12-
require_once( ABSPATH . 'wp-admin/includes/class-walker-category-checklist.php' );
13-
14-
/** WP_Internal_Pointers class */
15-
require_once( ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php' );
16-
1711
//
1812
// Category Checklists
1913
//

0 commit comments

Comments
 (0)