Changeset 50981

Timestamp:

05/24/2021 07:58:13 PM (2 years ago)

Author:

desrosj

Message:

General: Avoid unnecessary calls to update_user_option().

The update_user_option() function is a way to update a user meta value after adding a blog’s prefix to the beginning of the meta key. But when the fourth parameter is true, the behavior is exactly the same as calling update_user_meta() directly.

This replaces all instances of update_user_option() when the fourth parameter is true in Core with a direct call to update_user_meta() to prevent an unnecessary call to update_user_option().

Props johnjamesjacoby, zkancs, obenland, desrosj.
Fixes #43339.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (5 diffs)
• wp-admin/includes/nav-menu.php (modified) (3 diffs)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-admin/includes/user.php (modified) (2 diffs)
• wp-admin/my-sites.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -375 +375 @@
          */
         if ( $ip_changed || $search ) {
-            update_user_option( $user_id, 'community-events-location', $events['location'], true );
+            update_user_meta( $user_id, 'community-events-location', $events['location'] );
         }
 
@@ -1734 +1734 @@
 
     if ( is_array( $closed ) ) {
-        update_user_option( $user->ID, "closedpostboxes_$page", $closed, true );
+        update_user_meta( $user->ID, "closedpostboxes_$page", $closed );
     }
 
@@ -1740 +1740 @@
         // Postboxes that are always shown.
         $hidden = array_diff( $hidden, array( 'submitdiv', 'linksubmitdiv', 'manage-menu', 'create-menu' ) );
-        update_user_option( $user->ID, "metaboxhidden_$page", $hidden, true );
+        update_user_meta( $user->ID, "metaboxhidden_$page", $hidden );
     }
 
@@ -1765 +1765 @@
 
     $hidden = ! empty( $_POST['hidden'] ) ? explode( ',', $_POST['hidden'] ) : array();
-    update_user_option( $user->ID, "manage{$page}columnshidden", $hidden, true );
+    update_user_meta( $user->ID, "manage{$page}columnshidden", $hidden );
 
     wp_die( 1 );
@@ -1920 +1920 @@
 
     if ( $order ) {
-        update_user_option( $user->ID, "meta-box-order_$page", $order, true );
+        update_user_meta( $user->ID, "meta-box-order_$page", $order );
     }
 
     if ( $page_columns ) {
-        update_user_option( $user->ID, "screen_layout_$page", $page_columns, true );
+        update_user_meta( $user->ID, "screen_layout_$page", $page_columns );
     }
 

trunk/src/wp-admin/includes/nav-menu.php

@@ -155 +155 @@
     if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
         $user = wp_get_current_user();
-        update_user_option(
+        update_user_meta(
             $user->ID,
             'managenav-menuscolumnshidden',
@@ -164 +164 @@
                 3 => 'description',
                 4 => 'title-attribute',
-            ),
-            true
+            )
         );
     }
@@ -200 +199 @@
 
     $user = wp_get_current_user();
-    update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
+    update_user_meta( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes );
 }
 

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

@@ -89 +89 @@
             $message       = __( '<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.' );
             $user_id       = wp_create_user( $user_name, $user_password, $user_email );
-            update_user_option( $user_id, 'default_password_nag', true, true );
+            update_user_meta( $user_id, 'default_password_nag', true );
             $email_password = true;
             $user_created   = true;

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

@@ -483 +483 @@
     ) {
         delete_user_setting( 'default_password_nag' );
-        update_user_option( $user_ID, 'default_password_nag', false, true );
+        update_user_meta( $user_ID, 'default_password_nag', false );
     }
 }
@@ -504 +504 @@
     if ( $new_data->user_pass != $old_data->user_pass ) {
         delete_user_setting( 'default_password_nag' );
-        update_user_option( $user_ID, 'default_password_nag', false, true );
+        update_user_meta( $user_ID, 'default_password_nag', false );
     }
 }

trunk/src/wp-admin/my-sites.php

@@ -28 +28 @@
     $blog = get_site( (int) $_POST['primary_blog'] );
     if ( $blog && isset( $blog->domain ) ) {
-        update_user_option( $current_user->ID, 'primary_blog', (int) $_POST['primary_blog'], true );
+        update_user_meta( $current_user->ID, 'primary_blog', (int) $_POST['primary_blog'] );
         $updated = true;
     } else {

trunk/src/wp-includes/script-loader.php

@@ -1790 +1790 @@
     if ( $saved_ip_address && $current_ip_address && $current_ip_address !== $saved_ip_address ) {
         $saved_location['ip'] = $current_ip_address;
-        update_user_option( $user_id, 'community-events-location', $saved_location, true );
+        update_user_meta( $user_id, 'community-events-location', $saved_location );
     }
 

trunk/src/wp-includes/user.php

@@ -2874 +2874 @@
 
     wp_set_password( $new_pass, $user->ID );
-    update_user_option( $user->ID, 'default_password_nag', false, true );
+    update_user_meta( $user->ID, 'default_password_nag', false );
 
     /**
@@ -2985 +2985 @@
     }
 
-    update_user_option( $user_id, 'default_password_nag', true, true ); // Set up the password change nag.
+    update_user_meta( $user_id, 'default_password_nag', true ); // Set up the password change nag.
 
     /**