WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
02/06/2020 06:31:22 AM (7 years ago)
Author:
SergeyBiryukov
Message:

Code Modernization: Replace dirname( __FILE__ ) calls with __DIR__ magic constant.

This avoids the performance overhead of the function call every time dirname( __FILE__ ) was used instead of __DIR__.

This commit also includes:

  • Removing unnecessary parentheses from include/require statements. These are language constructs, not function calls.
  • Replacing include statements for several files with require_once, for consistency:
    • wp-admin/admin-header.php
    • wp-admin/admin-footer.php
    • wp-includes/version.php

Props ayeshrajans, desrosj, valentinbora, jrf, joostdevalk, netweb.
Fixes #48082.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r47122 r47198  
    295295                }
    296296
    297                 require_once( ABSPATH . WPINC . '/class-wp-customize-setting.php' );
    298                 require_once( ABSPATH . WPINC . '/class-wp-customize-panel.php' );
    299                 require_once( ABSPATH . WPINC . '/class-wp-customize-section.php' );
    300                 require_once( ABSPATH . WPINC . '/class-wp-customize-control.php' );
    301 
    302                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' );
    303                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' );
    304                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' );
    305                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' );
    306                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' );
    307                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-position-control.php' );
    308                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
    309                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
    310                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
    311                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
    312                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-code-editor-control.php' );
    313                 require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
    314                 require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' );
    315                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' );
    316                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' );
    317                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' );
    318                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
    319                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-locations-control.php' );
    320                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
    321 
    322                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' );
    323 
    324                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-panel.php' );
    325                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php' );
    326                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' );
    327                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' );
    328 
    329                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-custom-css-setting.php' );
    330                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
    331                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' );
    332                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' );
    333                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' );
    334                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' );
     297                require_once ABSPATH . WPINC . '/class-wp-customize-setting.php';
     298                require_once ABSPATH . WPINC . '/class-wp-customize-panel.php';
     299                require_once ABSPATH . WPINC . '/class-wp-customize-section.php';
     300                require_once ABSPATH . WPINC . '/class-wp-customize-control.php';
     301
     302                require_once ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php';
     303                require_once ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php';
     304                require_once ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php';
     305                require_once ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php';
     306                require_once ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php';
     307                require_once ABSPATH . WPINC . '/customize/class-wp-customize-background-position-control.php';
     308                require_once ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php';
     309                require_once ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php';
     310                require_once ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php';
     311                require_once ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php';
     312                require_once ABSPATH . WPINC . '/customize/class-wp-customize-code-editor-control.php';
     313                require_once ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php';
     314                require_once ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php';
     315                require_once ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php';
     316                require_once ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php';
     317                require_once ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php';
     318                require_once ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php';
     319                require_once ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-locations-control.php';
     320                require_once ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php';
     321
     322                require_once ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php';
     323
     324                require_once ABSPATH . WPINC . '/customize/class-wp-customize-themes-panel.php';
     325                require_once ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php';
     326                require_once ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php';
     327                require_once ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php';
     328
     329                require_once ABSPATH . WPINC . '/customize/class-wp-customize-custom-css-setting.php';
     330                require_once ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php';
     331                require_once ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php';
     332                require_once ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php';
     333                require_once ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php';
     334                require_once ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php';
    335335
    336336                /**
    … …  
    351351                $components = apply_filters( 'customize_loaded_components', $this->components, $this );
    352352
    353                 require_once( ABSPATH . WPINC . '/customize/class-wp-customize-selective-refresh.php' );
     353                require_once ABSPATH . WPINC . '/customize/class-wp-customize-selective-refresh.php';
    354354                $this->selective_refresh = new WP_Customize_Selective_Refresh( $this );
    355355
    356356                if ( in_array( 'widgets', $components, true ) ) {
    357                         require_once( ABSPATH . WPINC . '/class-wp-customize-widgets.php' );
     357                        require_once ABSPATH . WPINC . '/class-wp-customize-widgets.php';
    358358                        $this->widgets = new WP_Customize_Widgets( $this );
    359359                }
    360360
    361361                if ( in_array( 'nav_menus', $components, true ) ) {
    362                         require_once( ABSPATH . WPINC . '/class-wp-customize-nav-menus.php' );
     362                        require_once ABSPATH . WPINC . '/class-wp-customize-nav-menus.php';
    363363                        $this->nav_menus = new WP_Customize_Nav_Menus( $this );
    364364                }
    … …  
    16421642
    16431643                // Such is The WordPress Way.
    1644                 require_once( ABSPATH . 'wp-admin/includes/file.php' );
    1645                 require_once( ABSPATH . 'wp-admin/includes/media.php' );
    1646                 require_once( ABSPATH . 'wp-admin/includes/image.php' );
     1644                require_once ABSPATH . 'wp-admin/includes/file.php';
     1645                require_once ABSPATH . 'wp-admin/includes/media.php';
     1646                require_once ABSPATH . 'wp-admin/includes/image.php';
    16471647
    16481648                foreach ( $attachments as $symbol => $attachment ) {
Note: See TracChangeset for help on using the changeset viewer.