Ticket #31588: 31588.2.diff

src/wp-includes/user.php

@@ -2023 +2023 @@
 
         $meta['rich_editing'] = empty( $userdata['rich_editing'] ) ? 'true' : $userdata['rich_editing'];
 
-        $meta['comment_shortcuts'] = empty( $userdata['comment_shortcuts'] ) ? 'false' : $userdata['comment_shortcuts'];
+        $meta['comment_shortcuts'] = empty( $userdata['comment_shortcuts'] ) || 'false' === $userdata['comment_shortcuts'] ? 'false' : 'true';
 
         $admin_color = empty( $userdata['admin_color'] ) ? 'fresh' : $userdata['admin_color'];
         $meta['admin_color'] = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $admin_color );

tests/phpunit/tests/user.php

@@ -308 +308 @@
                 // Test update of fields in _get_additional_user_keys()
                 $user_data = array( 'ID' => $user_id, 'use_ssl' => 1, 'show_admin_bar_front' => 1,
                                                    'rich_editing' => 1, 'first_name' => 'first', 'last_name' => 'last',
-                                                   'nickname' => 'nick', 'comment_shortcuts' => 1, 'admin_color' => 'classic',
+                                                   'nickname' => 'nick', 'comment_shortcuts' => 'true', 'admin_color' => 'classic',
                                                    'description' => 'describe' );
                 wp_update_user( $user_data );