vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-07 14:14:36 +00:00
Code Issues Actions 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.

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
Download Patch File Download Diff File Expand all files Collapse all files

28
src/wp-admin/admin.php
View File

@@ -31,7 +31,7 @@ if ( isset( $_GET['import'] ) && ! defined( 'WP_LOAD_IMPORTERS' ) ) {
define( 'WP_LOAD_IMPORTERS', true );
}
require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
require_once dirname( __DIR__ ) . '/wp-load.php';
nocache_headers();
@@ -73,7 +73,7 @@ if ( get_option( 'db_upgraded' ) ) {
* attempt to do no more than threshold value, with some +/- allowed.
*/
if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int) ( $c / 50 ) ) == 1 ) ) {
require_once( ABSPATH . WPINC . '/http.php' );
require_once ABSPATH . WPINC . '/http.php';
$response = wp_remote_get(
admin_url( 'upgrade.php?step=1' ),
array(
@@ -89,7 +89,7 @@ if ( get_option( 'db_upgraded' ) ) {
}
}
require_once( ABSPATH . 'wp-admin/includes/admin.php' );
require_once ABSPATH . 'wp-admin/includes/admin.php';
auth_redirect();
@@ -146,11 +146,11 @@ if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] )
}
if ( WP_NETWORK_ADMIN ) {
require( ABSPATH . 'wp-admin/network/menu.php' );
require ABSPATH . 'wp-admin/network/menu.php';
} elseif ( WP_USER_ADMIN ) {
require( ABSPATH . 'wp-admin/user/menu.php' );
require ABSPATH . 'wp-admin/user/menu.php';
} else {
require( ABSPATH . 'wp-admin/menu.php' );
require ABSPATH . 'wp-admin/menu.php';
}
if ( current_user_can( 'manage_options' ) ) {
@@ -231,7 +231,7 @@ if ( isset( $plugin_page ) ) {
*/
do_action( "load-{$page_hook}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
if ( ! isset( $_GET['noheader'] ) ) {
require_once( ABSPATH . 'wp-admin/admin-header.php' );
require_once ABSPATH . 'wp-admin/admin-header.php';
}
/**
@@ -277,17 +277,17 @@ if ( isset( $plugin_page ) ) {
do_action( "load-{$plugin_page}" ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
if ( ! isset( $_GET['noheader'] ) ) {
require_once( ABSPATH . 'wp-admin/admin-header.php' );
require_once ABSPATH . 'wp-admin/admin-header.php';
}
if ( file_exists( WPMU_PLUGIN_DIR . "/$plugin_page" ) ) {
include( WPMU_PLUGIN_DIR . "/$plugin_page" );
include WPMU_PLUGIN_DIR . "/$plugin_page";
} else {
include( WP_PLUGIN_DIR . "/$plugin_page" );
include WP_PLUGIN_DIR . "/$plugin_page";
}
}
include( ABSPATH . 'wp-admin/admin-footer.php' );
require_once ABSPATH . 'wp-admin/admin-footer.php';
exit();
} elseif ( isset( $_GET['import'] ) ) {
@@ -322,10 +322,10 @@ if ( isset( $plugin_page ) ) {
$title = __( 'Import' );
if ( ! isset( $_GET['noheader'] ) ) {
require_once( ABSPATH . 'wp-admin/admin-header.php' );
require_once ABSPATH . 'wp-admin/admin-header.php';
}
require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
require_once ABSPATH . 'wp-admin/includes/upgrade.php';
define( 'WP_IMPORTING', true );
@@ -345,7 +345,7 @@ if ( isset( $plugin_page ) ) {
call_user_func( $wp_importers[ $importer ][2] );
include( ABSPATH . 'wp-admin/admin-footer.php' );
require_once ABSPATH . 'wp-admin/admin-footer.php';
// Make sure rules are flushed.
flush_rewrite_rules( false );