Ticket #22310: patch.diff

wp-admin/includes/user.php

@@ -112 +112 @@
         }
 
         if ( $update ) {
-                $user->rich_editing         = isset( $_POST['rich_editing'] ) && 'false' === $_POST['rich_editing'] ? 'false' : 'true';
-                $user->syntax_highlighting  = isset( $_POST['syntax_highlighting'] ) && 'false' === $_POST['syntax_highlighting'] ? 'false' : 'true';
+                $user->rich_editing         = isset( $_POST['rich_editing'] ) && $_POST['rich_editing'] === 'false' ? false : true;
+                $user->syntax_highlighting  = isset( $_POST['syntax_highlighting'] ) && $_POST['syntax_highlighting'] === 'false' ? false : true;
                 $user->admin_color          = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
-                $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
+                $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) && $_POST['admin_bar_front'] === 'false' ? true : false;
                 $user->locale               = '';
 
                 if ( isset( $_POST['locale'] ) ) {

wp-admin/user-edit.php

@@ -314 +314 @@
 <th scope="row"><?php _e( 'Toolbar' ); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Toolbar' ); ?></span></legend>
 <label for="admin_bar_front">
-<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
+<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="false" <?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
 <?php _e( 'Show Toolbar when viewing site' ); ?></label><br />
 </fieldset>
 </td>

wp-includes/user.php

@@ -1478 +1478 @@
  *                                             if `$display_name` is not specified.
  *     @type string      $description          The user's biographical description.
  *     @type string|bool $rich_editing         Whether to enable the rich-editor for the user.
- *                                             False if not empty.
+ *                                             Default true.
  *     @type string|bool $syntax_highlighting  Whether to enable the rich code editor for the user.
- *                                             False if not empty.
+ *                                             Default true.
  *     @type string|bool $comment_shortcuts    Whether to enable comment moderation keyboard
  *                                             shortcuts for the user. Default false.
  *     @type string      $admin_color          Admin color scheme for the user. Default 'fresh'.
@@ -1692 +1692 @@
          */
         $meta['description'] = apply_filters( 'pre_user_description', $description );
 
-        $meta['rich_editing'] = empty( $userdata['rich_editing'] ) ? 'true' : $userdata['rich_editing'];
+        $meta['rich_editing'] = isset( $userdata['rich_editing'] ) && empty( $userdata['rich_editing'] ) ? 'false' : 'true';
 
-        $meta['syntax_highlighting'] = empty( $userdata['syntax_highlighting'] ) ? 'true' : $userdata['syntax_highlighting'];
+        $meta['syntax_highlighting'] = isset( $userdata['syntax_highlighting'] ) && empty( $userdata['syntax_highlighting'] ) ? 'false' : 'true';
 
         $meta['comment_shortcuts'] = empty( $userdata['comment_shortcuts'] ) || 'false' === $userdata['comment_shortcuts'] ? 'false' : 'true';
 
@@ -1705 +1705 @@
 
         $user_registered = empty( $userdata['user_registered'] ) ? gmdate( 'Y-m-d H:i:s' ) : $userdata['user_registered'];
 
-        $meta['show_admin_bar_front'] = empty( $userdata['show_admin_bar_front'] ) ? 'true' : $userdata['show_admin_bar_front'];
+        $meta['show_admin_bar_front'] = isset( $userdata['show_admin_bar_front'] ) && empty( $userdata['show_admin_bar_front'] ) ? 'false' : 'true';
 
         $meta['locale'] = isset( $userdata['locale'] ) ? $userdata['locale'] : '';
 
@@ -1782 +1782 @@
          *     @type string   $first_name           The user's first name.
          *     @type string   $last_name            The user's last name.
          *     @type string   $description          The user's description.
-         *     @type bool     $rich_editing         Whether to enable the rich-editor for the user. False if not empty.
-         *     @type bool     $syntax_highlighting  Whether to enable the rich code editor for the user. False if not empty.
+         *     @type bool     $rich_editing         Whether to enable the rich-editor for the user. Default true
+         *     @type bool     $syntax_highlighting  Whether to enable the rich code editor for the user. Default true
          *     @type bool     $comment_shortcuts    Whether to enable keyboard shortcuts for the user. Default false.
          *     @type string   $admin_color          The color scheme for a user's admin screen. Default 'fresh'.
          *     @type int|bool $use_ssl              Whether to force SSL on the user's admin area. 0|false if SSL is