Changeset 32904

Timestamp:

06/22/2015 08:43:58 PM (8 years ago)

Author:

wonderboymusic

Message:

After [32884], update the default value for comment_shortcuts.

Props dlh, rachelbaker, DrewAPicture.
Fixes #31588.

Location:

trunk

Files:

• src/wp-includes/user.php (modified) (1 diff)
• tests/phpunit/tests/user.php (modified) (1 diff)

trunk/src/wp-includes/user.php

@@ -2024 +2024 @@
     $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'];

trunk/tests/phpunit/tests/user.php

@@ -309 +309 @@
         $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 );