WordPress.org
Get WordPress

Make WordPress Core

Changeset 38411


Ignore:
Timestamp:
08/27/2016 10:31:11 PM (10 years ago)
Author:
wonderboymusic
Message:

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.

Location:
trunk
Files:
47 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/includes/admin.php

    r38402 r38411  
    5151
    5252/** WordPress Administration Screen API */
    53 require_once(ABSPATH . 'wp-admin/includes/class-wp-screen.php');
    5453require_once(ABSPATH . 'wp-admin/includes/screen.php');
    5554
    … …  
    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');
    6562require_once(ABSPATH . 'wp-admin/includes/list-table.php');
    6663
    … …  
    7067/** WordPress User Administration API */
    7168require_once(ABSPATH . 'wp-admin/includes/user.php');
    72 
    73 /** WordPress Site Icon API */
    74 require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php');
    7569
    7670/** WordPress Update Administration API */

  • trunk/src/wp-admin/includes/ajax-actions.php

    r38402 r38411  
    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
    … …  
    31383137function 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        }
    … …  
    31543152function 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        }
    … …  
    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
    … …  
    33333329        }
    33343330
    3335         include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
    33363331        include_once( ABSPATH . 'wp-admin/includes/theme.php' );
    33373332
    … …  
    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 ) ) {
    … …  
    35913584        }
    35923585
    3593         include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
    35943586        include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
    35953587
    … …  
    36993691        }
    37003692
    3701         include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
    3702 
    37033693        wp_update_plugins();
    37043694

  • trunk/src/wp-admin/includes/class-ftp.php

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

  • trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php

    r38402 r38411  
    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

  • trunk/src/wp-admin/includes/class-wp-upgrader.php

    r38402 r38411  
    99 * @since 2.8.0
    1010 */
    11 
    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';
    4411
    4512/**
    … …  
    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';

  • trunk/src/wp-admin/includes/deprecated.php

    r38402 r38411  
    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
    … …  
    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);
    … …  
    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);
    … …  
    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);

  • trunk/src/wp-admin/includes/file.php

    r38402 r38411  
    738738        mbstring_binary_safe_encoding();
    739739
    740         require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
    741 
    742740        $archive = new PclZip($file);
    743741
    … …  
    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
    … …  
    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                /**
    … …  
    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;
    912 
    913                 require_once($abstraction_file);
    914         }
    915         $method = "WP_Filesystem_$method";
    916 
    917         $wp_filesystem = new $method($args);
     923                }
     924
     925                require_once( $abstraction_file );
     926        }
     927
     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.

  • trunk/src/wp-admin/includes/list-table.php

    r38402 r38411  
    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'] );

  • trunk/src/wp-admin/includes/nav-menu.php

    r38402 r38411  
    77 * @since 3.0.0
    88 */
    9 
    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' );
    159
    1610/**

  • trunk/src/wp-admin/includes/template.php

    r38402 r38411  
    88 * @subpackage Administration
    99 */
    10 
    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' );
    1610
    1711//

  • trunk/src/wp-admin/includes/translation-install.php

    r38402 r38411  
    203203        $translation = (object) $translation;
    204204
    205         require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
    206205        $skin = new Automatic_Upgrader_Skin;
    207206        $upgrader = new Language_Pack_Upgrader( $skin );
    … …  
    229228        }
    230229
    231         require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
    232230        $skin = new Automatic_Upgrader_Skin;
    233231        $upgrader = new Language_Pack_Upgrader( $skin );

  • trunk/src/wp-admin/includes/update.php

    r38402 r38411  
    7474        if ( ! $updates || empty( $updates->updates ) )
    7575                return false;
    76 
    77         include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
    7876
    7977        $auto_update = false;

  • trunk/src/wp-admin/install.php

    r38402 r38411  
    4141/** Load WordPress Translation Install API */
    4242require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
    43 
    44 /** Load wpdb */
    45 require_once( ABSPATH . WPINC . '/wp-db.php' );
    4643
    4744nocache_headers();

  • trunk/src/wp-admin/press-this.php

    r38402 r38411  
    2424 */
    2525if ( empty( $GLOBALS['wp_press_this'] ) ) {
    26         include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
    2726        $GLOBALS['wp_press_this'] = new WP_Press_This();
    2827}

  • trunk/src/wp-admin/update-core.php

    r38402 r38411  
    164164
    165165                if ( wp_http_supports( array( 'ssl' ) ) ) {
    166                         require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
    167166                        $upgrader = new WP_Automatic_Updater;
    168167                        $future_minor_update = (object) array(
    … …  
    188187
    189188        if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) {
    190                 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
    191189                $upgrader = new WP_Automatic_Updater;
    192190                if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) {
    … …  
    439437        global $wp_filesystem;
    440438
    441         include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
    442 
    443439        if ( $reinstall )
    444440                $url = 'update-core.php?action=do-core-reinstall';
    … …  
    711707
    712708        require_once( ABSPATH . 'wp-admin/admin-header.php' );
    713         include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
    714709
    715710        $url = 'update-core.php?action=do-translation-upgrade';

  • trunk/src/wp-admin/update.php

    r38402 r38411  
    1212/** WordPress Administration Bootstrap */
    1313require_once( dirname( __FILE__ ) . '/admin.php' );
    14 
    15 include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
    1614
    1715if ( isset($_GET['action']) ) {
    … …  
    219217                        wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
    220218
    221                 include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
    222 
    223219                check_admin_referer( 'install-theme_' . $theme );
    224220                $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.

  • trunk/src/wp-includes/admin-bar.php

    r38402 r38411  
    2424        global $wp_admin_bar;
    2525
    26         if ( ! is_admin_bar_showing() )
     26        if ( ! is_admin_bar_showing() ) {
    2727                return false;
    28 
    29         /* Load the admin bar class code ready for instantiation */
    30         require_once( ABSPATH . WPINC . '/class-wp-admin-bar.php' );
     28        }
    3129
    3230        /* Instantiate the admin bar */
    … …  
    4038         */
    4139        $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
    42         if ( class_exists( $admin_bar_class ) )
     40        if ( class_exists( $admin_bar_class ) ) {
    4341                $wp_admin_bar = new $admin_bar_class;
    44         else
     42        } else {
    4543                return false;
    46 
     44        }
    4745        $wp_admin_bar->initialize();
    4846        $wp_admin_bar->add_menus();
    … …  
    295293
    296294        if ( is_network_admin() ) {
    297                 /* translators: %s: site name */ 
     295                /* translators: %s: site name */
    298296                $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
    299297        } elseif ( is_user_admin() ) {
    300                 /* translators: %s: site name */ 
     298                /* translators: %s: site name */
    301299                $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
    302300        }

  • trunk/src/wp-includes/class-IXR.php

    r38402 r38411  
    3939 * @license    http://www.opensource.org/licenses/bsd-license.php BSD
    4040 */
    41 
    42 require_once( ABSPATH . WPINC . '/IXR/class-IXR-value.php' );
    43 
    44 require_once( ABSPATH . WPINC . '/IXR/class-IXR-message.php' );
    45 
    46 require_once( ABSPATH . WPINC . '/IXR/class-IXR-server.php' );
    47 
    48 require_once( ABSPATH . WPINC . '/IXR/class-IXR-request.php' );
    49 
    50 require_once( ABSPATH . WPINC . '/IXR/class-IXR-client.php' );
    51 
    52 require_once( ABSPATH . WPINC . '/IXR/class-IXR-error.php' );
    53 
    54 require_once( ABSPATH . WPINC . '/IXR/class-IXR-date.php' );
    55 
    56 require_once( ABSPATH . WPINC . '/IXR/class-IXR-base64.php' );
    57 
    58 require_once( ABSPATH . WPINC . '/IXR/class-IXR-introspectionserver.php' );
    59 
    60 require_once( ABSPATH . WPINC . '/IXR/class-IXR-clientmulticall.php' );

  • trunk/src/wp-includes/class-http.php

    r38402 r38411  
    88 */
    99
    10 if ( ! class_exists( 'Requests' ) ) {
     10if ( ! class_exists( 'Requests', false ) ) {
    1111        require( ABSPATH . WPINC . '/class-requests.php' );
    1212

  • trunk/src/wp-includes/class-phpmailer.php

    r38402 r38411  
    13861386    {
    13871387        if (!is_object($this->smtp)) {
    1388                 require_once( 'class-smtp.php' );
    13891388            $this->smtp = new SMTP;
    13901389        }

  • trunk/src/wp-includes/class-wp-customize-control.php

    r38402 r38411  
    599599
    600600}
    601 
    602 /** WP_Customize_Color_Control class */
    603 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' );
    604 
    605 /** WP_Customize_Media_Control class */
    606 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' );
    607 
    608 /** WP_Customize_Upload_Control class */
    609 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' );
    610 
    611 /** WP_Customize_Image_Control class */
    612 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' );
    613 
    614 /** WP_Customize_Background_Image_Control class */
    615 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' );
    616 
    617 /** WP_Customize_Cropped_Image_Control class */
    618 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
    619 
    620 /** WP_Customize_Site_Icon_Control class */
    621 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
    622 
    623 /** WP_Customize_Header_Image_Control class */
    624 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
    625 
    626 /** WP_Customize_Theme_Control class */
    627 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
    628 
    629 /** WP_Widget_Area_Customize_Control class */
    630 require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
    631 
    632 /** WP_Widget_Form_Customize_Control class */
    633 require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' );
    634 
    635 /** WP_Customize_Nav_Menu_Control class */
    636 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' );
    637 
    638 /** WP_Customize_Nav_Menu_Item_Control class */
    639 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' );
    640 
    641 /** WP_Customize_Nav_Menu_Location_Control class */
    642 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' );
    643 
    644 /** WP_Customize_Nav_Menu_Name_Control class */
    645 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
    646 
    647 /** WP_Customize_Nav_Menu_Auto_Add_Control class */
    648 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
    649 
    650 /** WP_Customize_New_Menu_Control class */
    651 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' );

  • trunk/src/wp-includes/class-wp-customize-manager.php

    r38402 r38411  
    206206         */
    207207        public function __construct() {
    208                 require_once( ABSPATH . WPINC . '/class-wp-customize-setting.php' );
    209                 require_once( ABSPATH . WPINC . '/class-wp-customize-panel.php' );
    210                 require_once( ABSPATH . WPINC . '/class-wp-customize-section.php' );
    211                 require_once( ABSPATH . WPINC . '/class-wp-customize-control.php' );
    212 
    213                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' );
    214                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' );
    215                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' );
    216                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' );
    217                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' );
    218                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
    219                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
    220                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
    221                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
    222                 require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
    223                 require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' );
    224                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' );
    225                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' );
    226                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' );
    227                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
    228                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
    229                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' );
    230 
    231                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' );
    232 
    233                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php' );
    234                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' );
    235                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' );
    236                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' );
    237 
    238                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
    239                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' );
    240                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' );
    241                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' );
    242                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' );
    243 
    244208                /**
    245209                 * Filters the core Customizer components to load.
    … …  
    259223                $components = apply_filters( 'customize_loaded_components', $this->components, $this );
    260224
    261                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-selective-refresh.php' );
    262225                $this->selective_refresh = new WP_Customize_Selective_Refresh( $this );
    263226
    264227                if ( in_array( 'widgets', $components, true ) ) {
    265                         require_once( ABSPATH . WPINC . '/class-wp-customize-widgets.php' );
    266228                        $this->widgets = new WP_Customize_Widgets( $this );
    267229                }
    268230
    269231                if ( in_array( 'nav_menus', $components, true ) ) {
    270                         require_once( ABSPATH . WPINC . '/class-wp-customize-nav-menus.php' );
    271232                        $this->nav_menus = new WP_Customize_Nav_Menus( $this );
    272233                }

  • trunk/src/wp-includes/class-wp-customize-panel.php

    r38402 r38411  
    385385        }
    386386}
    387 
    388 /** WP_Customize_Nav_Menus_Panel class */
    389 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' );

  • trunk/src/wp-includes/class-wp-customize-section.php

    r38402 r38411  
    374374        }
    375375}
    376 
    377 /** WP_Customize_Themes_Section class */
    378 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php' );
    379 
    380 /** WP_Customize_Sidebar_Section class */
    381 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' );
    382 
    383 /** WP_Customize_Nav_Menu_Section class */
    384 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' );
    385 
    386 /** WP_Customize_New_Menu_Section class */
    387 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' );

  • trunk/src/wp-includes/class-wp-customize-setting.php

    r38402 r38411  
    894894        }
    895895}
    896 
    897 /** WP_Customize_Filter_Setting class */
    898 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
    899 
    900 /** WP_Customize_Header_Image_Setting class */
    901 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' );
    902 
    903 /** WP_Customize_Background_Image_Setting class */
    904 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' );
    905 
    906 /** WP_Customize_Nav_Menu_Item_Setting class */
    907 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' );
    908 
    909 /** WP_Customize_Nav_Menu_Setting class */
    910 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' );

  • trunk/src/wp-includes/comment.php

    r38402 r38411  
    23702370function pingback($content, $post_ID) {
    23712371        global $wp_version;
    2372         include_once(ABSPATH . WPINC . '/class-IXR.php');
    2373         include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
    23742372
    23752373        // original code by Mort (http://mort.mine.nu:8080)
    … …  
    25142512function weblog_ping($server = '', $path = '') {
    25152513        global $wp_version;
    2516         include_once(ABSPATH . WPINC . '/class-IXR.php');
    2517         include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
    25182514
    25192515        // using a timeout of 3 seconds should be enough to cover slow servers

  • trunk/src/wp-includes/customize/class-wp-customize-selective-refresh.php

    r38402 r38411  
    6868        public function __construct( WP_Customize_Manager $manager ) {
    6969                $this->manager = $manager;
    70                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-partial.php' );
    7170
    7271                add_action( 'customize_preview_init', array( $this, 'init_preview' ) );

  • trunk/src/wp-includes/feed.php

    r38402 r38411  
    667667                require_once( ABSPATH . WPINC . '/class-simplepie.php' );
    668668        }
    669         require_once( ABSPATH . WPINC . '/class-wp-feed-cache.php' );
    670         require_once( ABSPATH . WPINC . '/class-wp-feed-cache-transient.php' );
    671         require_once( ABSPATH . WPINC . '/class-wp-simplepie-file.php' );
    672         require_once( ABSPATH . WPINC . '/class-wp-simplepie-sanitize-kses.php' );
    673669
    674670        $feed = new SimplePie();

  • trunk/src/wp-includes/functions.php

    r38402 r38411  
    562562
    563563        //TODO: Tidy this ghetto code up and make the debug code optional
    564         include_once( ABSPATH . WPINC . '/class-IXR.php' );
    565 
    566564        $post_links = array();
    567565

  • trunk/src/wp-includes/general-template.php

    r38402 r38411  
    29812981 */
    29822982function wp_editor( $content, $editor_id, $settings = array() ) {
    2983         if ( ! class_exists( '_WP_Editors', false ) )
    2984                 require( ABSPATH . WPINC . '/class-wp-editor.php' );
    2985 
    29862983        _WP_Editors::editor($content, $editor_id, $settings);
    29872984}

  • trunk/src/wp-includes/link-template.php

    r38402 r38411  
    29102910        global $is_IE, $wp_version;
    29112911
    2912         include_once( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
    29132912        $GLOBALS['wp_press_this'] = new WP_Press_This();
    29142913        $bookmarklet_version = $GLOBALS['wp_press_this']->version;

  • trunk/src/wp-includes/load.php

    r38404 r38411  
    395395        global $wpdb;
    396396
    397         require_once( ABSPATH . WPINC . '/wp-db.php' );
    398397        if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
    399398                require_once( WP_CONTENT_DIR . '/db.php' );
    400399
    401         if ( isset( $wpdb ) )
     400        if ( isset( $wpdb ) ) {
    402401                return;
     402        }
    403403
    404404        $wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );

  • trunk/src/wp-includes/media.php

    r38402 r38411  
    29102910 */
    29112911function _wp_image_editor_choose( $args = array() ) {
    2912         require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
    2913         require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
    2914         require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
    2915 
    29162912        /**
    29172913         * Filters the list of image editing library classes.

  • trunk/src/wp-includes/ms-settings.php

    r38402 r38411  
    2222 */
    2323global $current_site, $current_blog;
    24 
    25 /** WP_Network class */
    26 require_once( ABSPATH . WPINC . '/class-wp-network.php' );
    27 
    28 /** WP_Site class */
    29 require_once( ABSPATH . WPINC . '/class-wp-site.php' );
    3024
    3125/** Multisite loader */

  • trunk/src/wp-includes/nav-menu-template.php

    r38402 r38411  
    77 * @since 3.0.0
    88 */
    9 
    10 /** Walker_Nav_Menu class */
    11 require_once ABSPATH . WPINC . '/class-walker-nav-menu.php';
    129
    1310/**

  • trunk/src/wp-includes/pluggable.php

    r38402 r38411  
    212212        if ( ! ( $phpmailer instanceof PHPMailer ) ) {
    213213                require_once ABSPATH . WPINC . '/class-phpmailer.php';
    214                 require_once ABSPATH . WPINC . '/class-smtp.php';
    215214                $phpmailer = new PHPMailer( true );
    216215        }

  • trunk/src/wp-includes/script-loader.php

    r38402 r38411  
    1717 */
    1818
    19 /** WordPress Dependency Class */
    20 require( ABSPATH . WPINC . '/class-wp-dependency.php' );
    21 
    22 /** WordPress Dependencies Class */
    23 require( ABSPATH . WPINC . '/class.wp-dependencies.php' );
    24 
    25 /** WordPress Scripts Class */
    26 require( ABSPATH . WPINC . '/class.wp-scripts.php' );
    27 
    2819/** WordPress Scripts Functions */
    2920require( ABSPATH . WPINC . '/functions.wp-scripts.php' );
    30 
    31 /** WordPress Styles Class */
    32 require( ABSPATH . WPINC . '/class.wp-styles.php' );
    3321
    3422/** WordPress Styles Functions */

  • trunk/src/wp-includes/theme.php

    r38402 r38411  
    17571757
    17581758                if ( is_admin() ) {
    1759                         require_once( ABSPATH . 'wp-admin/custom-header.php' );
    17601759                        $custom_image_header = new Custom_Image_Header( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
    17611760                }
    … …  
    17701769
    17711770                if ( is_admin() ) {
    1772                         require_once( ABSPATH . 'wp-admin/custom-background.php' );
    17731771                        $custom_background = new Custom_Background( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
    17741772                }
    … …  
    20832081        }
    20842082
    2085         require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
    20862083        $GLOBALS['wp_customize'] = new WP_Customize_Manager();
    20872084}

  • trunk/src/wp-includes/update.php

    r38402 r38411  
    506506function wp_maybe_auto_update() {
    507507        include_once( ABSPATH . '/wp-admin/includes/admin.php' );
    508         include_once( ABSPATH . '/wp-admin/includes/class-wp-upgrader.php' );
    509508
    510509        $upgrader = new WP_Automatic_Updater;

  • trunk/src/wp-includes/wp-diff.php

    r38402 r38411  
    1717        require( ABSPATH . WPINC . '/Text/Diff/Renderer/inline.php' );
    1818}
    19 
    20 require( ABSPATH . WPINC . '/class-wp-text-diff-renderer-table.php' );
    21 require( ABSPATH . WPINC . '/class-wp-text-diff-renderer-inline.php' );

  • trunk/src/wp-mail.php

    r38402 r38411  
    2121 */
    2222do_action( 'wp-mail.php' );
    23 
    24 /** Get the POP3 class with which to access the mailbox. */
    25 require_once( ABSPATH . WPINC . '/class-pop3.php' );
    2623
    2724/** Only check at this interval for new messages. */

  • trunk/src/wp-settings.php

    r38402 r38411  
    1717 */
    1818define( 'WPINC', 'wp-includes' );
     19
     20// WordPress Core PHP 5.2-compatible Autoloader
     21require_once( ABSPATH . 'wp-vendor/autoload_52.php' );
    1922
    2023// Include files required for initialization.
    … …  
    9497require( ABSPATH . WPINC . '/option.php' );
    9598require( ABSPATH . WPINC . '/functions.php' );
    96 require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' );
    97 require( ABSPATH . WPINC . '/class-wp.php' );
    98 require( ABSPATH . WPINC . '/class-wp-error.php' );
    9999require( ABSPATH . WPINC . '/pomo/mo.php' );
    100 require( ABSPATH . WPINC . '/class-phpass.php' );
    101100
    102101// Include the wpdb class and, if present, a db.php database drop-in.
    … …  
    116115// Initialize multisite if enabled.
    117116if ( is_multisite() ) {
    118         require( ABSPATH . WPINC . '/class-wp-site-query.php' );
    119         require( ABSPATH . WPINC . '/class-wp-network-query.php' );
    120117        require( ABSPATH . WPINC . '/ms-blogs.php' );
    121118        require( ABSPATH . WPINC . '/ms-settings.php' );
    … …  
    137134
    138135// Load most of WordPress.
    139 require( ABSPATH . WPINC . '/class-wp-walker.php' );
    140 require( ABSPATH . WPINC . '/class-wp-ajax-response.php' );
    141136require( ABSPATH . WPINC . '/formatting.php' );
    142137require( ABSPATH . WPINC . '/capabilities.php' );
    143 require( ABSPATH . WPINC . '/class-wp-roles.php' );
    144 require( ABSPATH . WPINC . '/class-wp-role.php' );
    145 require( ABSPATH . WPINC . '/class-wp-user.php' );
    146 require( ABSPATH . WPINC . '/class-wp-query.php' );
    147138require( ABSPATH . WPINC . '/query.php' );
    148 require( ABSPATH . WPINC . '/date.php' );
    149139require( ABSPATH . WPINC . '/theme.php' );
    150 require( ABSPATH . WPINC . '/class-wp-theme.php' );
    151140require( ABSPATH . WPINC . '/template.php' );
    152141require( ABSPATH . WPINC . '/user.php' );
    153 require( ABSPATH . WPINC . '/class-wp-user-query.php' );
    154 require( ABSPATH . WPINC . '/class-wp-session-tokens.php' );
    155 require( ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php' );
    156142require( ABSPATH . WPINC . '/meta.php' );
    157 require( ABSPATH . WPINC . '/class-wp-meta-query.php' );
    158 require( ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php' );
    159143require( ABSPATH . WPINC . '/general-template.php' );
    160144require( ABSPATH . WPINC . '/link-template.php' );
    161145require( ABSPATH . WPINC . '/author-template.php' );
    162146require( ABSPATH . WPINC . '/post.php' );
    163 require( ABSPATH . WPINC . '/class-walker-page.php' );
    164 require( ABSPATH . WPINC . '/class-walker-page-dropdown.php' );
    165 require( ABSPATH . WPINC . '/class-wp-post-type.php' );
    166 require( ABSPATH . WPINC . '/class-wp-post.php' );
    167147require( ABSPATH . WPINC . '/post-template.php' );
    168148require( ABSPATH . WPINC . '/revision.php' );
    … …  
    170150require( ABSPATH . WPINC . '/post-thumbnail-template.php' );
    171151require( ABSPATH . WPINC . '/category.php' );
    172 require( ABSPATH . WPINC . '/class-walker-category.php' );
    173 require( ABSPATH . WPINC . '/class-walker-category-dropdown.php' );
    174152require( ABSPATH . WPINC . '/category-template.php' );
    175153require( ABSPATH . WPINC . '/comment.php' );
    176 require( ABSPATH . WPINC . '/class-wp-comment.php' );
    177 require( ABSPATH . WPINC . '/class-wp-comment-query.php' );
    178 require( ABSPATH . WPINC . '/class-walker-comment.php' );
    179154require( ABSPATH . WPINC . '/comment-template.php' );
    180155require( ABSPATH . WPINC . '/rewrite.php' );
    181 require( ABSPATH . WPINC . '/class-wp-rewrite.php' );
    182156require( ABSPATH . WPINC . '/feed.php' );
    183157require( ABSPATH . WPINC . '/bookmark.php' );
    … …  
    188162require( ABSPATH . WPINC . '/script-loader.php' );
    189163require( ABSPATH . WPINC . '/taxonomy.php' );
    190 require( ABSPATH . WPINC . '/class-wp-term.php' );
    191 require( ABSPATH . WPINC . '/class-wp-term-query.php' );
    192 require( ABSPATH . WPINC . '/class-wp-tax-query.php' );
    193164require( ABSPATH . WPINC . '/update.php' );
    194165require( ABSPATH . WPINC . '/canonical.php' );
    195166require( ABSPATH . WPINC . '/shortcodes.php' );
    196167require( ABSPATH . WPINC . '/embed.php' );
    197 require( ABSPATH . WPINC . '/class-wp-embed.php' );
    198 require( ABSPATH . WPINC . '/class-oembed.php' );
    199 require( ABSPATH . WPINC . '/class-wp-oembed-controller.php' );
    200168require( ABSPATH . WPINC . '/media.php' );
    201169require( ABSPATH . WPINC . '/http.php' );
    202 require( ABSPATH . WPINC . '/class-http.php' );
    203 require( ABSPATH . WPINC . '/class-wp-http-streams.php' );
    204 require( ABSPATH . WPINC . '/class-wp-http-curl.php' );
    205 require( ABSPATH . WPINC . '/class-wp-http-proxy.php' );
    206 require( ABSPATH . WPINC . '/class-wp-http-cookie.php' );
    207 require( ABSPATH . WPINC . '/class-wp-http-encoding.php' );
    208 require( ABSPATH . WPINC . '/class-wp-http-response.php' );
    209 require( ABSPATH . WPINC . '/class-wp-http-requests-response.php' );
    210170require( ABSPATH . WPINC . '/widgets.php' );
    211 require( ABSPATH . WPINC . '/class-wp-widget.php' );
    212 require( ABSPATH . WPINC . '/class-wp-widget-factory.php' );
    213171require( ABSPATH . WPINC . '/nav-menu.php' );
    214172require( ABSPATH . WPINC . '/nav-menu-template.php' );
    215173require( ABSPATH . WPINC . '/admin-bar.php' );
    216174require( ABSPATH . WPINC . '/rest-api.php' );
    217 require( ABSPATH . WPINC . '/rest-api/class-wp-rest-server.php' );
    218 require( ABSPATH . WPINC . '/rest-api/class-wp-rest-response.php' );
    219 require( ABSPATH . WPINC . '/rest-api/class-wp-rest-request.php' );
    220 require( ABSPATH . WPINC . '/class-wp-locale.php' );
    221175
    222176$GLOBALS['wp_embed'] = new WP_Embed();

  • trunk/src/wp-vendor/autoload_52.php

    r38410 r38411  
    55require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
    66
    7 return ComposerAutoloaderInit84e65be829c2294b794a94e0a8b5807c::getLoader();
     7return ComposerAutoloaderInit1dd196791ebd0cfea0668c22edc062f9::getLoader();

  • trunk/src/wp-vendor/composer/autoload_real_52.php

    r38410 r38411  
    33// autoload_real_52.php generated by xrstf/composer-php52
    44
    5 class ComposerAutoloaderInit84e65be829c2294b794a94e0a8b5807c {
     5class ComposerAutoloaderInit1dd196791ebd0cfea0668c22edc062f9 {
    66        private static $loader;
    77
    … …  
    2020                }
    2121
    22                 spl_autoload_register(array('ComposerAutoloaderInit84e65be829c2294b794a94e0a8b5807c', 'loadClassLoader'), true /*, true */);
     22                spl_autoload_register(array('ComposerAutoloaderInit1dd196791ebd0cfea0668c22edc062f9', 'loadClassLoader'), true /*, true */);
    2323                self::$loader = $loader = new xrstf_Composer52_ClassLoader();
    24                 spl_autoload_unregister(array('ComposerAutoloaderInit84e65be829c2294b794a94e0a8b5807c', 'loadClassLoader'));
     24                spl_autoload_unregister(array('ComposerAutoloaderInit1dd196791ebd0cfea0668c22edc062f9', 'loadClassLoader'));
    2525
    2626                $vendorDir = dirname(dirname(__FILE__));

  • trunk/src/xmlrpc.php

    r38402 r38411  
    6060}
    6161
    62 include_once(ABSPATH . 'wp-admin/includes/admin.php');
    63 include_once(ABSPATH . WPINC . '/class-IXR.php');
    64 include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
     62include_once( ABSPATH . 'wp-admin/includes/admin.php' );
    6563
    6664/**

  • trunk/tests/phpunit/includes/install.php

    r38402 r38411  
    2121
    2222require_once ABSPATH . '/wp-admin/includes/upgrade.php';
    23 require_once ABSPATH . '/wp-includes/wp-db.php';
    2423
    2524// Override the PHPMailer

  • trunk/tests/phpunit/includes/testcase-xmlrpc.php

    r38402 r38411  
    11<?php
    2 include_once(ABSPATH . 'wp-admin/includes/admin.php');
    3 include_once(ABSPATH . WPINC . '/class-IXR.php');
    4 include_once(ABSPATH . WPINC . '/class-wp-xmlrpc-server.php');
     2include_once( ABSPATH . 'wp-admin/includes/admin.php' );
    53
    64class WP_XMLRPC_UnitTestCase extends WP_UnitTestCase {
Note: See TracChangeset for help on using the changeset viewer.