Ticket #43339: 43339.4.diff

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

@@ -304 +304 @@
                  * The location is stored network-wide, so that the user doesn't have to set it on each site.
                  */
                 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'] );
                 }
 
                 wp_send_json_success( $events );
@@ -1545 +1545 @@
         }
 
         if ( is_array( $closed ) ) {
-                update_user_option( $user->ID, "closedpostboxes_$page", $closed, true );
+                update_user_meta( $user->ID, "closedpostboxes_$page", $closed );
         }
 
         if ( is_array( $hidden ) ) {
                 $hidden = array_diff( $hidden, array( 'submitdiv', 'linksubmitdiv', 'manage-menu', 'create-menu' ) ); // postboxes that are always shown
-                update_user_option( $user->ID, "metaboxhidden_$page", $hidden, true );
+                update_user_meta( $user->ID, "metaboxhidden_$page", $hidden );
         }
 
         wp_die( 1 );
@@ -1574 +1574 @@
         }
 
         $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 );
 }
@@ -1727 +1727 @@
         }
 
         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 );
         }
 
         wp_die( 1 );

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

@@ -148 +148 @@
         // If first time editing, disable advanced items by default.
         if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
                 $user = wp_get_current_user();
-                update_user_option(
+                update_user_meta(
                         $user->ID, 'managenav-menuscolumnshidden',
                         array(
                                 0 => 'link-target',
@@ -156 +156 @@
                                 2 => 'xfn',
                                 3 => 'description',
                                 4 => 'title-attribute',
-                        ),
-                        true
+                        )
                 );
         }
 }
@@ -192 +191 @@
         }
 
         $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 );
 }
 
 /**

src/wp-admin/includes/upgrade.php

@@ -79 +79 @@
                         $user_password = wp_generate_password( 12, false );
                         $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;
                 } elseif ( ! $user_id ) {
                         // Password has been provided

src/wp-admin/includes/user.php

@@ -464 +464 @@
         // get_user_setting = JS saved UI setting. else no-js-fallback code.
         if ( 'hide' == get_user_setting( 'default_password_nag' ) || isset( $_GET['default_password_nag'] ) && '0' == $_GET['default_password_nag'] ) {
                 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 );
         }
 }
 
@@ -485 +485 @@
         // Remove the nag if the password has been changed.
         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 );
         }
 }
 

src/wp-admin/my-sites.php

@@ -27 +27 @@
 
         $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 {
                 wp_die( __( 'The primary site you chose does not exist.' ) );

src/wp-admin/network/site-new.php

@@ -139 +139 @@
         $wpdb->show_errors();
         if ( ! is_wp_error( $id ) ) {
                 if ( ! is_super_admin( $user_id ) && ! get_user_option( 'primary_blog', $user_id ) ) {
-                        update_user_option( $user_id, 'primary_blog', $id, true );
+                        update_user_meta( $user_id, 'primary_blog', $id );
                 }
 
                 wp_mail(

src/wp-includes/script-loader.php

@@ -1311 +1311 @@
          */
         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 );
         }
 
         $events_client = new WP_Community_Events( $user_id, $saved_location );

src/wp-includes/user.php

@@ -1370 +1370 @@
 
 /**
  * Determines whether the given username exists.
- * 
+ *
  * For more information on this and similar theme functions, check out
- * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ 
+ * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
  * Conditional Tags} article in the Theme Developer Handbook.
  *
  * @since 2.0.0
@@ -1400 +1400 @@
 
 /**
  * Determines whether the given email exists.
- * 
+ *
  * For more information on this and similar theme functions, check out
- * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/ 
+ * the {@link https://developer.wordpress.org/themes/basics/conditional-tags/
  * Conditional Tags} article in the Theme Developer Handbook.
  *
  * @since 2.1.0
@@ -2376 +2376 @@
         do_action( 'password_reset', $user, $new_pass );
 
         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 );
 
         /**
          * Fires after the user's password is reset.
@@ -2480 +2480 @@
                 return $errors;
         }
 
-        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.
 
         /**
          * Fires after a new user registration has been recorded.