Changeset 47198 for trunk/src/wp-admin/admin.php

Timestamp:

02/06/2020 06:31:22 AM (5 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-admin/admin.php (modified) (8 diffs)

trunk/src/wp-admin/admin.php

@@ -32 +32 @@
 }
 
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require_once dirname( __DIR__ ) . '/wp-load.php';
 
 nocache_headers();
@@ -74 +74 @@
          */
         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' ),
@@ -90 +90 @@
 }
 
-require_once( ABSPATH . 'wp-admin/includes/admin.php' );
+require_once ABSPATH . 'wp-admin/includes/admin.php';
 
 auth_redirect();
@@ -147 +147 @@
 
 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';
 }
 
@@ -232 +232 @@
         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';
         }
 
@@ -278 +278 @@
 
         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( ABSPATH . 'wp-admin/admin-footer.php' );
+            include WP_PLUGIN_DIR . "/$plugin_page";
+        }
+    }
+
+    require_once ABSPATH . 'wp-admin/admin-footer.php';
 
     exit();
@@ -323 +323 @@
 
     if ( ! isset( $_GET['noheader'] ) ) {
-        require_once( ABSPATH . 'wp-admin/admin-header.php' );
-    }
-
-    require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once ABSPATH . 'wp-admin/admin-header.php';
+    }
+
+    require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
     define( 'WP_IMPORTING', true );
@@ -346 +346 @@
     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.