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
This commit is contained in:
Sergey Biryukov
2020-02-06 06:31:22 +00:00
parent b02e49c2e8
commit e72fff9cef
304 changed files with 1068 additions and 1063 deletions

View File

@@ -8,7 +8,7 @@
*/
/** WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
require_once __DIR__ . '/admin.php';
if ( ! current_user_can( 'list_users' ) ) {
wp_die(
@@ -264,7 +264,7 @@ switch ( $wp_list_table->current_action() ) {
add_action( 'admin_head', 'delete_users_add_js' );
}
include( ABSPATH . 'wp-admin/admin-header.php' );
require_once ABSPATH . 'wp-admin/admin-header.php';
?>
<form method="post" name="updateusers" id="updateusers">
<?php wp_nonce_field( 'delete-users' ); ?>
@@ -406,7 +406,7 @@ switch ( $wp_list_table->current_action() ) {
$userids = $_REQUEST['users'];
}
include( ABSPATH . 'wp-admin/admin-header.php' );
require_once ABSPATH . 'wp-admin/admin-header.php';
?>
<form method="post" name="updateusers" id="updateusers">
<?php wp_nonce_field( 'remove-users' ); ?>
@@ -475,7 +475,7 @@ switch ( $wp_list_table->current_action() ) {
exit;
}
include( ABSPATH . 'wp-admin/admin-header.php' );
require_once ABSPATH . 'wp-admin/admin-header.php';
$messages = array();
if ( isset( $_GET['update'] ) ) :
@@ -597,4 +597,4 @@ if ( strlen( $usersearch ) ) {
} // End of the $doaction switch.
include( ABSPATH . 'wp-admin/admin-footer.php' );
require_once ABSPATH . 'wp-admin/admin-footer.php';