Changeset 47198 for trunk/src/wp-admin/update-core.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/update-core.php (modified) (13 diffs)

trunk/src/wp-admin/update-core.php

@@ -8 +8 @@
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once __DIR__ . '/admin.php';
 
 wp_enqueue_style( 'plugin-install' );
@@ -298 +298 @@
     $cur_wp_version = preg_replace( '/-.*$/', '', $wp_version );
 
-    require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+    require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
     $plugins = get_plugin_updates();
     if ( empty( $plugins ) ) {
@@ -560 +560 @@
     global $wp_filesystem;
 
-    include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+    require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
     if ( $reinstall ) {
@@ -737 +737 @@
     wp_version_check( array(), $force_check );
 
-    require_once( ABSPATH . 'wp-admin/admin-header.php' );
+    require_once ABSPATH . 'wp-admin/admin-header.php';
     ?>
     <div class="wrap">
@@ -794 +794 @@
     );
 
-    include( ABSPATH . 'wp-admin/admin-footer.php' );
+    require_once ABSPATH . 'wp-admin/admin-footer.php';
 
 } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
@@ -811 +811 @@
     }
 
-    require_once( ABSPATH . 'wp-admin/admin-header.php' );
+    require_once ABSPATH . 'wp-admin/admin-header.php';
     if ( 'do-core-reinstall' == $action ) {
         $reinstall = true;
@@ -830 +830 @@
     );
 
-    include( ABSPATH . 'wp-admin/admin-footer.php' );
+    require_once ABSPATH . 'wp-admin/admin-footer.php';
 
 } elseif ( 'do-plugin-upgrade' == $action ) {
@@ -854 +854 @@
     $title = __( 'Update Plugins' );
 
-    require_once( ABSPATH . 'wp-admin/admin-header.php' );
+    require_once ABSPATH . 'wp-admin/admin-header.php';
     echo '<div class="wrap">';
     echo '<h1>' . __( 'Update Plugins' ) . '</h1>';
@@ -868 +868 @@
     );
 
-    include( ABSPATH . 'wp-admin/admin-footer.php' );
+    require_once ABSPATH . 'wp-admin/admin-footer.php';
 
 } elseif ( 'do-theme-upgrade' == $action ) {
@@ -892 +892 @@
     $title = __( 'Update Themes' );
 
-    require_once( ABSPATH . 'wp-admin/admin-header.php' );
+    require_once ABSPATH . 'wp-admin/admin-header.php';
     ?>
     <div class="wrap">
@@ -908 +908 @@
     );
 
-    include( ABSPATH . 'wp-admin/admin-footer.php' );
+    require_once ABSPATH . 'wp-admin/admin-footer.php';
 
 } elseif ( 'do-translation-upgrade' == $action ) {
@@ -918 +918 @@
     check_admin_referer( 'upgrade-translations' );
 
-    require_once( ABSPATH . 'wp-admin/admin-header.php' );
-    include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+    require_once ABSPATH . 'wp-admin/admin-header.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
     $url     = 'update-core.php?action=do-translation-upgrade';
@@ -937 +937 @@
     );
 
-    require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+    require_once ABSPATH . 'wp-admin/admin-footer.php';
 
 } else {