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

trunk/src/wp-admin/includes/plugin.php

@@ -657 +657 @@
                         define( 'WP_SANDBOX_SCRAPING', true );
                 }
-                include_once( WP_PLUGIN_DIR . '/' . $plugin );
+                include_once WP_PLUGIN_DIR . '/' . $plugin;
                 $plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin.
 
@@ -908 +908 @@
         if ( false === $credentials ) {
                 if ( ! empty( $data ) ) {
-                        include_once( ABSPATH . 'wp-admin/admin-header.php' );
+                        require_once ABSPATH . 'wp-admin/admin-header.php';
                         echo $data;
-                        include( ABSPATH . 'wp-admin/admin-footer.php' );
+                        require_once ABSPATH . 'wp-admin/admin-footer.php';
                         exit;
                 }
@@ -923 +923 @@
 
                 if ( ! empty( $data ) ) {
-                        include_once( ABSPATH . 'wp-admin/admin-header.php' );
+                        require_once ABSPATH . 'wp-admin/admin-header.php';
                         echo $data;
-                        include( ABSPATH . 'wp-admin/admin-footer.php' );
+                        require_once ABSPATH . 'wp-admin/admin-footer.php';
                         exit;
                 }
@@ -1220 +1220 @@
                 define( 'WP_UNINSTALL_PLUGIN', $file );
                 wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
-                include( WP_PLUGIN_DIR . '/' . dirname( $file ) . '/uninstall.php' );
+                include WP_PLUGIN_DIR . '/' . dirname( $file ) . '/uninstall.php';
 
                 return true;
@@ -1232 +1232 @@
 
                 wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
-                include( WP_PLUGIN_DIR . '/' . $file );
+                include WP_PLUGIN_DIR . '/' . $file;
 
                 add_action( "uninstall_{$file}", $callable );
@@ -2253 +2253 @@
         }
         wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
-        include( WP_PLUGIN_DIR . '/' . $plugin );
+        include WP_PLUGIN_DIR . '/' . $plugin;
 }
 
@@ -2308 +2308 @@
 
         if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
-                require_once( ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php' );
+                require_once ABSPATH . 'wp-admin/includes/class-wp-privacy-policy-content.php';
         }