HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests 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.
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

14
wp-admin/network/users.php
View File

@@ -8,7 +8,7 @@
*/
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
require_once __DIR__ . '/admin.php';
if ( ! current_user_can( 'manage_network_users' ) ) {
wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
@@ -31,11 +31,11 @@ if ( isset( $_GET['action'] ) ) {
$_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle arrays.
$title = __( 'Users' );
$parent_file = 'users.php';
require_once( ABSPATH . 'wp-admin/admin-header.php' );
require_once ABSPATH . 'wp-admin/admin-header.php';
echo '<div class="wrap">';
confirm_delete_users( $_POST['allusers'] );
echo '</div>';
require_once( ABSPATH . 'wp-admin/admin-footer.php' );
require_once ABSPATH . 'wp-admin/admin-footer.php';
} else {
wp_redirect( network_admin_url( 'users.php' ) );
}
@@ -61,11 +61,11 @@ if ( isset( $_GET['action'] ) ) {
}
$title = __( 'Users' );
$parent_file = 'users.php';
require_once( ABSPATH . 'wp-admin/admin-header.php' );
require_once ABSPATH . 'wp-admin/admin-header.php';
echo '<div class="wrap">';
confirm_delete_users( $_POST['allusers'] );
echo '</div>';
require_once( ABSPATH . 'wp-admin/admin-footer.php' );
require_once ABSPATH . 'wp-admin/admin-footer.php';
exit();
case 'spam':
@@ -237,7 +237,7 @@ get_current_screen()->set_screen_reader_content(
)
);
require_once( ABSPATH . 'wp-admin/admin-header.php' );
require_once ABSPATH . 'wp-admin/admin-header.php';
if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
?>
@@ -294,4 +294,4 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty(
</form>
</div>
<?php require_once( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
<?php require_once ABSPATH . 'wp-admin/admin-footer.php'; ?>