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

Timestamp:

02/06/2020 06:31:22 AM (7 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.php (modified) (16 diffs)

trunk/src/wp-admin/update.php

@@ -12 +12 @@
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-
-include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+require_once __DIR__ . '/admin.php';
+
+require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
 if ( isset( $_GET['action'] ) ) {
@@ -61 +61 @@
 
                 wp_enqueue_script( 'updates' );
-                require_once( ABSPATH . 'wp-admin/admin-header.php' );
+                require_once ABSPATH . 'wp-admin/admin-header.php';
 
                 $nonce = 'upgrade-plugin_' . $plugin;
@@ -69 +69 @@
                 $upgrader->upgrade( $plugin );
 
-                include( ABSPATH . 'wp-admin/admin-footer.php' );
+                require_once ABSPATH . 'wp-admin/admin-footer.php';
 
         } elseif ( 'activate-plugin' == $action ) {
@@ -94 +94 @@
                         ini_set( 'display_errors', true ); // Ensure that fatal errors are displayed.
                         wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
-                        include( WP_PLUGIN_DIR . '/' . $plugin );
+                        include WP_PLUGIN_DIR . '/' . $plugin;
                 }
                 iframe_footer();
@@ -103 +103 @@
                 }
 
-                include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); // For plugins_api().
+                include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; // For plugins_api().
 
                 check_admin_referer( 'install-plugin_' . $plugin );
@@ -123 +123 @@
                 $parent_file  = 'plugins.php';
                 $submenu_file = 'plugin-install.php';
-                require_once( ABSPATH . 'wp-admin/admin-header.php' );
+                require_once ABSPATH . 'wp-admin/admin-header.php';
 
                 /* translators: %s: Plugin name and version. */
@@ -138 +138 @@
                 $upgrader->install( $api->download_link );
 
-                include( ABSPATH . 'wp-admin/admin-footer.php' );
+                require_once ABSPATH . 'wp-admin/admin-footer.php';
 
         } elseif ( 'upload-plugin' == $action ) {
@@ -153 +153 @@
                 $parent_file  = 'plugins.php';
                 $submenu_file = 'plugin-install.php';
-                require_once( ABSPATH . 'wp-admin/admin-header.php' );
+                require_once ABSPATH . 'wp-admin/admin-header.php';
 
                 /* translators: %s: File name. */
@@ -168 +168 @@
                 }
 
-                include( ABSPATH . 'wp-admin/admin-footer.php' );
+                require_once ABSPATH . 'wp-admin/admin-footer.php';
 
         } elseif ( 'upgrade-theme' == $action ) {
@@ -183 +183 @@
                 $parent_file  = 'themes.php';
                 $submenu_file = 'themes.php';
-                require_once( ABSPATH . 'wp-admin/admin-header.php' );
+                require_once ABSPATH . 'wp-admin/admin-header.php';
 
                 $nonce = 'upgrade-theme_' . $theme;
@@ -191 +191 @@
                 $upgrader->upgrade( $theme );
 
-                include( ABSPATH . 'wp-admin/admin-footer.php' );
+                require_once ABSPATH . 'wp-admin/admin-footer.php';
         } elseif ( 'update-selected-themes' == $action ) {
                 if ( ! current_user_can( 'update_themes' ) ) {
@@ -225 +225 @@
                 }
 
-                include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); // For themes_api().
+                include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; // For themes_api().
 
                 check_admin_referer( 'install-theme_' . $theme );
@@ -246 +246 @@
                 $parent_file  = 'themes.php';
                 $submenu_file = 'themes.php';
-                require_once( ABSPATH . 'wp-admin/admin-header.php' );
+                require_once ABSPATH . 'wp-admin/admin-header.php';
 
                 /* translators: %s: Theme name and version. */
@@ -257 +257 @@
                 $upgrader->install( $api->download_link );
 
-                include( ABSPATH . 'wp-admin/admin-footer.php' );
+                require_once ABSPATH . 'wp-admin/admin-footer.php';
 
         } elseif ( 'upload-theme' == $action ) {
@@ -273 +273 @@
                 $submenu_file = 'theme-install.php';
 
-                require_once( ABSPATH . 'wp-admin/admin-header.php' );
+                require_once ABSPATH . 'wp-admin/admin-header.php';
 
                 /* translators: %s: File name. */
@@ -288 +288 @@
                 }
 
-                include( ABSPATH . 'wp-admin/admin-footer.php' );
+                require_once ABSPATH . 'wp-admin/admin-footer.php';
 
         } else {