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

@@ -11,7 +11,7 @@ $multisite = ! empty( $argv[2] );
define( 'WP_INSTALLING', true );
require_once $config_file_path;
require_once dirname( __FILE__ ) . '/functions.php';
require_once __DIR__ . '/functions.php';
// Set the theme to our special empty theme, to avoid interference from the current Twenty* theme.
if ( ! defined( 'WP_DEFAULT_THEME' ) ) {
@@ -33,10 +33,10 @@ require_once ABSPATH . '/wp-includes/wp-db.php';
// Override the PHPMailer.
global $phpmailer;
require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
require_once __DIR__ . '/mock-mailer.php';
$phpmailer = new MockPHPMailer();
register_theme_directory( dirname( __FILE__ ) . '/../data/themedir1' );
register_theme_directory( __DIR__ . '/../data/themedir1' );
/*
* default_storage_engine and storage_engine are the same option, but storage_engine