IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
Built from https://develop.svn.wordpress.org/trunk@47198


git-svn-id: http://core.svn.wordpress.org/trunk@46998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov
2020-02-06 06:33:11 +00:00
parent ecb8633dcc
commit 47ed56f38f
220 changed files with 901 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wp-includes/script-loader.php
View File

@@ -17,22 +17,22 @@
*/
/** WordPress Dependency Class */
require( ABSPATH . WPINC . '/class-wp-dependency.php' );
require ABSPATH . WPINC . '/class-wp-dependency.php';
/** WordPress Dependencies Class */
require( ABSPATH . WPINC . '/class.wp-dependencies.php' );
require ABSPATH . WPINC . '/class.wp-dependencies.php';
/** WordPress Scripts Class */
require( ABSPATH . WPINC . '/class.wp-scripts.php' );
require ABSPATH . WPINC . '/class.wp-scripts.php';
/** WordPress Scripts Functions */
require( ABSPATH . WPINC . '/functions.wp-scripts.php' );
require ABSPATH . WPINC . '/functions.wp-scripts.php';
/** WordPress Styles Class */
require( ABSPATH . WPINC . '/class.wp-styles.php' );
require ABSPATH . WPINC . '/class.wp-styles.php';
/** WordPress Styles Functions */
require( ABSPATH . WPINC . '/functions.wp-styles.php' );
require ABSPATH . WPINC . '/functions.wp-styles.php';
/**
* Registers TinyMCE scripts.
@@ -254,7 +254,6 @@ function wp_default_packages_scripts( &$scripts ) {
'html-entities',
'i18n',
'is-shallow-equal',
'keyboard-shortcuts',
'keycodes',
'list-reusable-blocks',
'media-utils',
@@ -295,7 +294,7 @@ function wp_default_packages_scripts( &$scripts ) {
continue;
}
$asset_file = include ABSPATH . WPINC . "/assets/dist/$package$suffix.asset.php";
$asset_file = require ABSPATH . WPINC . "/assets/dist/$package$suffix.asset.php";
$dependencies = $asset_file['dependencies'];
// Add dependencies that cannot be detected and generated by build tools.
@@ -596,7 +595,7 @@ function wp_scripts_get_suffix( $type = '' ) {
if ( $suffixes === null ) {
// Include an unmodified $wp_version.
include( ABSPATH . WPINC . '/version.php' );
require ABSPATH . WPINC . '/version.php';
$develop_src = false !== strpos( $wp_version, '-src' );
@@ -1666,7 +1665,7 @@ function wp_default_scripts( &$scripts ) {
*/
function wp_default_styles( &$styles ) {
// Include an unmodified $wp_version.
include( ABSPATH . WPINC . '/version.php' );
require ABSPATH . WPINC . '/version.php';
if ( ! defined( 'SCRIPT_DEBUG' ) ) {
define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
@@ -2042,7 +2041,7 @@ function wp_localize_community_events() {
return;
}
require_once( ABSPATH . 'wp-admin/includes/class-wp-community-events.php' );
require_once ABSPATH . 'wp-admin/includes/class-wp-community-events.php';
$user_id = get_current_user_id();
$saved_location = get_user_option( 'community-events-location', $user_id );