Skip to content

Commit e72fff9

Browse files
SergeyBiryukovSergeyBiryukov
committed
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. git-svn-id: https://develop.svn.wordpress.org/trunk@47198 602fd350-edb4-49c9-b593-d223f7449a82
1 parent b02e49c commit e72fff9

File tree

304 files changed

+1072
-1067
lines changed

Some content is hidden

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

304 files changed

+1072
-1067
lines changed

Diff for: ‎src/_index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
define( 'WP_USE_THEMES', true );
1515

1616
/** Loads the WordPress Environment and Template */
17-
require( dirname( __FILE__ ) . '/wp-blog-header.php' );
17+
require __DIR__ . '/wp-blog-header.php';

Diff for: ‎src/index.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/** Define ABSPATH as this file's directory */
1010
if ( ! defined( 'ABSPATH' ) ) {
11-
define( 'ABSPATH', dirname( __FILE__ ) . '/' );
11+
define( 'ABSPATH', __DIR__ . '/' );
1212
}
1313

1414
if ( file_exists( ABSPATH . 'wp-includes/js/dist/edit-post.js' ) ) {
@@ -17,14 +17,14 @@
1717
}
1818

1919
define( 'WPINC', 'wp-includes' );
20-
require_once( ABSPATH . WPINC . '/load.php' );
20+
require_once ABSPATH . WPINC . '/load.php';
2121

2222
// Standardize $_SERVER variables across setups.
2323
wp_fix_server_vars();
2424

25-
require_once( ABSPATH . WPINC . '/functions.php' );
25+
require_once ABSPATH . WPINC . '/functions.php';
2626
define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
27-
require_once( ABSPATH . WPINC . '/version.php' );
27+
require_once ABSPATH . WPINC . '/version.php';
2828

2929
wp_check_php_mysql_versions();
3030
wp_load_translations_early();

Diff for: ‎src/js/_enqueues/vendor/tinymce/wp-tinymce.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212
error_reporting( 0 );
1313

14-
$basepath = dirname( __FILE__ );
14+
$basepath = __DIR__;
1515

1616
function get_file( $path ) {
1717

Diff for: ‎src/wp-activate.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
define( 'WP_INSTALLING', true );
1010

1111
/** Sets up the WordPress Environment. */
12-
require( dirname( __FILE__ ) . '/wp-load.php' );
12+
require __DIR__ . '/wp-load.php';
1313

14-
require( dirname( __FILE__ ) . '/wp-blog-header.php' );
14+
require __DIR__ . '/wp-blog-header.php';
1515

1616
if ( ! is_multisite() ) {
1717
wp_redirect( wp_registration_url() );

Diff for: ‎src/wp-admin/_index.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
*/
88

99
/** Load WordPress Bootstrap */
10-
require_once( dirname( __FILE__ ) . '/admin.php' );
10+
require_once __DIR__ . '/admin.php';
1111

1212
/** Load WordPress dashboard API */
13-
require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
13+
require_once ABSPATH . 'wp-admin/includes/dashboard.php';
1414

1515
wp_dashboard_setup();
1616

@@ -108,7 +108,7 @@
108108
'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
109109
);
110110

111-
include( ABSPATH . 'wp-admin/admin-header.php' );
111+
require_once ABSPATH . 'wp-admin/admin-header.php';
112112
?>
113113

114114
<div class="wrap">
@@ -153,4 +153,4 @@
153153
<?php
154154
wp_print_community_events_templates();
155155

156-
require( ABSPATH . 'wp-admin/admin-footer.php' );
156+
require_once ABSPATH . 'wp-admin/admin-footer.php';

Diff for: ‎src/wp-admin/about.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
*/
88

99
/** WordPress Administration Bootstrap */
10-
require_once( dirname( __FILE__ ) . '/admin.php' );
10+
require_once __DIR__ . '/admin.php';
1111

1212
/* translators: Page title of the About WordPress page in the admin. */
1313
$title = _x( 'About', 'page title' );
1414

1515
list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
1616

17-
include( ABSPATH . 'wp-admin/admin-header.php' );
17+
require_once ABSPATH . 'wp-admin/admin-header.php';
1818
?>
1919
<div class="wrap about__container">
2020

@@ -202,7 +202,7 @@
202202
</div>
203203
<?php
204204

205-
include( ABSPATH . 'wp-admin/admin-footer.php' );
205+
require_once ABSPATH . 'wp-admin/admin-footer.php';
206206

207207
// These are strings we may use to describe maintenance/security releases, where we aim for no new strings.
208208
return;

Diff for: ‎src/wp-admin/admin-ajax.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020

2121
/** Load WordPress Bootstrap */
22-
require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
22+
require_once dirname( __DIR__ ) . '/wp-load.php';
2323

2424
/** Allow for cross-domain requests (from the front end). */
2525
send_origin_headers();
@@ -33,10 +33,10 @@
3333
}
3434

3535
/** Load WordPress Administration APIs */
36-
require_once( ABSPATH . 'wp-admin/includes/admin.php' );
36+
require_once ABSPATH . 'wp-admin/includes/admin.php';
3737

3838
/** Load Ajax Handlers for WordPress Core */
39-
require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
39+
require_once ABSPATH . 'wp-admin/includes/ajax-actions.php';
4040

4141
send_nosniff_header();
4242
nocache_headers();

Diff for: ‎src/wp-admin/admin-functions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
_deprecated_file( basename( __FILE__ ), '2.5.0', 'wp-admin/includes/admin.php' );
1313

1414
/** WordPress Administration API: Includes all Administration functions. */
15-
require_once( ABSPATH . 'wp-admin/includes/admin.php' );
15+
require_once ABSPATH . 'wp-admin/includes/admin.php';

Diff for: ‎src/wp-admin/admin-header.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
1010
if ( ! defined( 'WP_ADMIN' ) ) {
11-
require_once( dirname( __FILE__ ) . '/admin.php' );
11+
require_once __DIR__ . '/admin.php';
1212
}
1313

1414
/**
@@ -233,7 +233,7 @@
233233
?>
234234

235235
<div id="wpwrap">
236-
<?php require( ABSPATH . 'wp-admin/menu-header.php' ); ?>
236+
<?php require ABSPATH . 'wp-admin/menu-header.php'; ?>
237237
<div id="wpcontent">
238238

239239
<?php
@@ -289,5 +289,5 @@
289289
do_action( 'all_admin_notices' );
290290

291291
if ( $parent_file == 'options-general.php' ) {
292-
require( ABSPATH . 'wp-admin/options-head.php' );
292+
require ABSPATH . 'wp-admin/options-head.php';
293293
}

Diff for: ‎src/wp-admin/admin-post.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
}
1515

1616
if ( defined( 'ABSPATH' ) ) {
17-
require_once( ABSPATH . 'wp-load.php' );
17+
require_once ABSPATH . 'wp-load.php';
1818
} else {
19-
require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
19+
require_once dirname( __DIR__ ) . '/wp-load.php';
2020
}
2121

2222
/** Allow for cross-domain requests (from the front end). */
2323
send_origin_headers();
2424

25-
require_once( ABSPATH . 'wp-admin/includes/admin.php' );
25+
require_once ABSPATH . 'wp-admin/includes/admin.php';
2626

2727
nocache_headers();
2828

Diff for: ‎src/wp-admin/admin.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
define( 'WP_LOAD_IMPORTERS', true );
3232
}
3333

34-
require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
34+
require_once dirname( __DIR__ ) . '/wp-load.php';
3535

3636
nocache_headers();
3737

@@ -73,7 +73,7 @@
7373
* attempt to do no more than threshold value, with some +/- allowed.
7474
*/
7575
if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) == 1 ) ) {
76-
require_once( ABSPATH . WPINC . '/http.php' );
76+
require_once ABSPATH . WPINC . '/http.php';
7777
$response = wp_remote_get(
7878
admin_url( 'upgrade.php?step=1' ),
7979
array(
@@ -89,7 +89,7 @@
8989
}
9090
}
9191

92-
require_once( ABSPATH . 'wp-admin/includes/admin.php' );
92+
require_once ABSPATH . 'wp-admin/includes/admin.php';
9393

9494
auth_redirect();
9595

@@ -146,11 +146,11 @@
146146
}
147147

148148
if ( WP_NETWORK_ADMIN ) {
149-
require( ABSPATH . 'wp-admin/network/menu.php' );
149+
require ABSPATH . 'wp-admin/network/menu.php';
150150
} elseif ( WP_USER_ADMIN ) {
151-
require( ABSPATH . 'wp-admin/user/menu.php' );
151+
require ABSPATH . 'wp-admin/user/menu.php';
152152
} else {
153-
require( ABSPATH . 'wp-admin/menu.php' );
153+
require ABSPATH . 'wp-admin/menu.php';
154154
}
155155

156156
if ( current_user_can( 'manage_options' ) ) {
@@ -231,7 +231,7 @@
231231
*/
232232
do_action( "load-{$page_hook}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
233233
if ( ! isset( $_GET['noheader'] ) ) {
234-
require_once( ABSPATH . 'wp-admin/admin-header.php' );
234+
require_once ABSPATH . 'wp-admin/admin-header.php';
235235
}
236236

237237
/**
@@ -277,17 +277,17 @@
277277
do_action( "load-{$plugin_page}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
278278

279279
if ( ! isset( $_GET['noheader'] ) ) {
280-
require_once( ABSPATH . 'wp-admin/admin-header.php' );
280+
require_once ABSPATH . 'wp-admin/admin-header.php';
281281
}
282282

283283
if ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) ) {
284-
include( WPMU_PLUGIN_DIR . "/$plugin_page" );
284+
include WPMU_PLUGIN_DIR . "/$plugin_page";
285285
} else {
286-
include( WP_PLUGIN_DIR . "/$plugin_page" );
286+
include WP_PLUGIN_DIR . "/$plugin_page";
287287
}
288288
}
289289

290-
include( ABSPATH . 'wp-admin/admin-footer.php' );
290+
require_once ABSPATH . 'wp-admin/admin-footer.php';
291291

292292
exit();
293293
} elseif ( isset( $_GET['import'] ) ) {
@@ -322,10 +322,10 @@
322322
$title = __( 'Import' );
323323

324324
if ( ! isset( $_GET['noheader'] ) ) {
325-
require_once( ABSPATH . 'wp-admin/admin-header.php' );
325+
require_once ABSPATH . 'wp-admin/admin-header.php';
326326
}
327327

328-
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
328+
require_once ABSPATH . 'wp-admin/includes/upgrade.php';
329329

330330
define( 'WP_IMPORTING', true );
331331

@@ -345,7 +345,7 @@
345345

346346
call_user_func( $wp_importers[ $importer ][2] );
347347

348-
include( ABSPATH . 'wp-admin/admin-footer.php' );
348+
require_once ABSPATH . 'wp-admin/admin-footer.php';
349349

350350
// Make sure rules are flushed.
351351
flush_rewrite_rules( false );

Diff for: ‎src/wp-admin/async-upload.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
}
1616

1717
if ( defined( 'ABSPATH' ) ) {
18-
require_once( ABSPATH . 'wp-load.php' );
18+
require_once ABSPATH . 'wp-load.php';
1919
} else {
20-
require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
20+
require_once dirname( __DIR__ ) . '/wp-load.php';
2121
}
2222

23-
require_once( ABSPATH . 'wp-admin/admin.php' );
23+
require_once ABSPATH . 'wp-admin/admin.php';
2424

2525
header( 'Content-Type: text/plain; charset=' . get_option( 'blog_charset' ) );
2626

2727
if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
28-
include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
28+
require ABSPATH . 'wp-admin/includes/ajax-actions.php';
2929

3030
send_nosniff_header();
3131
nocache_headers();

Diff for: ‎src/wp-admin/comment.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88

99
/** Load WordPress Bootstrap */
10-
require_once( dirname( __FILE__ ) . '/admin.php' );
10+
require_once __DIR__ . '/admin.php';
1111

1212
$parent_file = 'edit-comments.php';
1313
$submenu_file = 'edit-comments.php';
@@ -58,7 +58,7 @@
5858
);
5959

6060
wp_enqueue_script( 'comment' );
61-
require_once( ABSPATH . 'wp-admin/admin-header.php' );
61+
require_once ABSPATH . 'wp-admin/admin-header.php';
6262

6363
$comment_id = absint( $_GET['c'] );
6464

@@ -77,7 +77,7 @@
7777

7878
$comment = get_comment_to_edit( $comment_id );
7979

80-
include( ABSPATH . 'wp-admin/edit-form-comment.php' );
80+
require ABSPATH . 'wp-admin/edit-form-comment.php';
8181

8282
break;
8383

@@ -106,7 +106,7 @@
106106
die();
107107
}
108108

109-
require_once( ABSPATH . 'wp-admin/admin-header.php' );
109+
require_once ABSPATH . 'wp-admin/admin-header.php';
110110

111111
$formaction = $action . 'comment';
112112
$nonce_action = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
@@ -357,4 +357,4 @@
357357

358358
} // End switch.
359359

360-
include( ABSPATH . 'wp-admin/admin-footer.php' );
360+
require_once ABSPATH . 'wp-admin/admin-footer.php';

Diff for: ‎src/wp-admin/credits.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
*/
88

99
/** WordPress Administration Bootstrap */
10-
require_once( dirname( __FILE__ ) . '/admin.php' );
11-
require_once( dirname( __FILE__ ) . '/includes/credits.php' );
10+
require_once __DIR__ . '/admin.php';
11+
require_once __DIR__ . '/includes/credits.php';
1212

1313
$title = __( 'Credits' );
1414

1515
list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
1616

17-
include( ABSPATH . 'wp-admin/admin-header.php' );
17+
require_once ABSPATH . 'wp-admin/admin-header.php';
1818

1919
$credits = wp_credits();
2020
?>
@@ -82,7 +82,7 @@
8282
<?php
8383
if ( ! $credits ) {
8484
echo '</div>';
85-
include( ABSPATH . 'wp-admin/admin-footer.php' );
85+
require_once ABSPATH . 'wp-admin/admin-footer.php';
8686
exit;
8787
}
8888
?>
@@ -129,7 +129,7 @@
129129
</div>
130130
<?php
131131

132-
include( ABSPATH . 'wp-admin/admin-footer.php' );
132+
require_once ABSPATH . 'wp-admin/admin-footer.php';
133133

134134
return;
135135

Diff for: ‎src/wp-admin/custom-background.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
_deprecated_file( basename( __FILE__ ), '5.3.0', 'wp-admin/includes/class-custom-background.php' );
1313

1414
/** Custom_Background class */
15-
require_once( ABSPATH . 'wp-admin/includes/class-custom-background.php' );
15+
require_once ABSPATH . 'wp-admin/includes/class-custom-background.php';

Diff for: ‎src/wp-admin/custom-header.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
_deprecated_file( basename( __FILE__ ), '5.3.0', 'wp-admin/includes/class-custom-image-header.php' );
1313

1414
/** Custom_Image_Header class */
15-
require_once( ABSPATH . 'wp-admin/includes/class-custom-image-header.php' );
15+
require_once ABSPATH . 'wp-admin/includes/class-custom-image-header.php';

Diff for: ‎src/wp-admin/customize.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
define( 'IFRAME_REQUEST', true );
1111

1212
/** Load WordPress Administration Bootstrap */
13-
require_once( dirname( __FILE__ ) . '/admin.php' );
13+
require_once __DIR__ . '/admin.php';
1414

1515
if ( ! current_user_can( 'customize' ) ) {
1616
wp_die(

0 commit comments

Comments
 (0)