Changeset 64344

Timestamp:

11/02/2026 04:10:54 PM (7 days ago)

Author:

lancewillett

Message:

Code Quality: Declare existing admin globals and simplify variable checks.

Document existing globals in user and plugin administration screens, initialize the remaining redirect and privacy management URL defaults, and remove a redundant old-user-data check from wp_insert_user().

Remove the corresponding PHPStan baseline entries.

Developed in: ​https://github.com/WordPress/wordpress-develop/pull/11979

Props huzaifaalmesbah, noruzzaman.
See #65817.

Built from ​https://develop.svn.wordpress.org/trunk@65195

Location:

trunk

Files:

• wp-admin/plugins.php (modified) (1 diff)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-admin/user-new.php (modified) (2 diffs)
• wp-admin/users.php (modified) (2 diffs)
• wp-includes/user.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/plugins.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once __DIR__ . '/admin.php';
+
+/**
+ * @global string $status   Current plugin status view, set by WP_Plugins_List_Table.
+ * @global int    $page     Current page number, set by WP_Plugins_List_Table.
+ * @global array  $plugins  Set by WP_Plugins_List_Table::prepare_items().
+ * @global int    $user_ID  ID of the current user, set during authentication.
+ */
+global $status, $page, $plugins, $user_ID;
 
 if ( ! current_user_can( 'activate_plugins' ) ) {

trunk/wp-admin/user-edit.php

@@ -12 +12 @@
 /** WordPress Translation Installation API */
 require_once ABSPATH . 'wp-admin/includes/translation-install.php';
+
+/**
+ * @global wpdb    $wpdb                  WordPress database abstraction object.
+ * @global array   $_wp_admin_css_colors  Registered admin color schemes.
+ * @global WP_Roles $wp_roles             The roles object.
+ */
+global $wpdb, $_wp_admin_css_colors, $wp_roles;
 
 $action          = ! empty( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : '';

trunk/wp-admin/user-new.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once __DIR__ . '/admin.php';
+
+/**
+ * @global wpdb $wpdb    WordPress database abstraction object.
+ * @global int  $blog_id The current site (blog) ID on multisite.
+ */
+global $wpdb, $blog_id;
 
 if ( is_multisite() ) {
@@ -241 +247 @@
 
                         if ( isset( $_POST['noconfirmation'] ) && current_user_can( 'manage_network_users' ) ) {
-                                /**
-                                 * @global wpdb $wpdb WordPress database abstraction object.
-                                 */
-                                global $wpdb;
-
                                 $key      = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $new_user_email ) );
                                 $new_user = wpmu_activate_signup( $key );

trunk/wp-admin/users.php

@@ -10 +10 @@
 /** WordPress Administration Bootstrap */
 require_once __DIR__ . '/admin.php';
+
+/**
+ * @global WP_User    $current_user The current user, set during authentication.
+ * @global WP_Roles   $wp_roles     The roles object.
+ * @global wpdb       $wpdb         WordPress database abstraction object.
+ * @global string     $usersearch   User search query, set by WP_Users_List_Table.
+ * @global int        $blog_id      The current site (blog) ID on multisite.
+ */
+global $current_user, $wp_roles, $wpdb, $usersearch, $blog_id;
 
 if ( ! current_user_can( 'list_users' ) ) {
@@ -94 +103 @@
 
 if ( empty( $_REQUEST ) ) {
-        $referer = '<input type="hidden" name="wp_http_referer" value="' . esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
+        $redirect = '';
+        $referer  = '<input type="hidden" name="wp_http_referer" value="' . esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
 } elseif ( isset( $_REQUEST['wp_http_referer'] ) ) {
         $redirect = remove_query_arg( array( 'wp_http_referer', 'updated', 'delete_count' ), wp_unslash( $_REQUEST['wp_http_referer'] ) );

trunk/wp-includes/user.php

@@ -2429 +2429 @@
          * accordingly.
          */
-        if ( ( ! $update || ( ! empty( $old_user_data ) && 0 !== strcasecmp( $user_email, $old_user_data->user_email ) ) )
+        if ( ( ! $update || 0 !== strcasecmp( $user_email, $old_user_data->user_email ) )
                 && ! defined( 'WP_IMPORTING' )
                 && email_exists( $user_email )
@@ -4327 +4327 @@
         }
 
+        $manage_url = '';
         if ( 'export_personal_data' === $request->action_name ) {
                 $manage_url = admin_url( 'export-personal-data.php' );

trunk/wp-includes/version.php

@@ -17 +17 @@
  * @global string $wp_version
  */
-$wp_version = '7.2-beta3-65194';
+$wp_version = '7.2-beta3-65195';
 
 /**