Ticket #22164: 22164.patch

wp-admin/admin-ajax.php

@@ -49 +49 @@
         'delete-meta', 'delete-post', 'trash-post', 'untrash-post', 'delete-page', 'dim-comment',
         'add-link-category', 'add-tag', 'get-tagcloud', 'get-comments', 'replyto-comment',
         'edit-comment', 'add-menu-item', 'add-meta', 'add-user', 'autosave', 'closed-postboxes',
-        'hidden-columns', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
+        'hidden-columns', 'comment-shortcuts', 'update-welcome-panel', 'menu-get-metabox', 'wp-link-ajax',
         'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink',
         'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order',
         'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 'wp-fullscreen-save-post',

wp-admin/includes/ajax-actions.php

@@ -1169 +1169 @@
         wp_die( 1 );
 }
 
+/**
+ * Save Keyboard Shortcuts user option.
+ *
+ * @since 3.5.0
+ */
+function wp_ajax_comment_shortcuts() {
+        check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' );
+
+        if ( ! current_user_can( 'moderate_comments' ) )
+                wp_die( -1 );
+
+        update_user_meta( get_current_user_id(), 'comment_shortcuts', empty( $_POST['comment_shortcuts'] ) ? 'false' : 'true' );
+
+        wp_die( 1 );
+}
+
 function wp_ajax_update_welcome_panel() {
         check_ajax_referer( 'welcome-panel-nonce', 'welcomepanelnonce' );
 

wp-admin/includes/screen.php

@@ -901 +901 @@
                 $this->_screen_settings = apply_filters( 'screen_settings', '', $this );
 
                 switch ( $this->id ) {
+                        case 'edit-comments':
+                                $current_user = wp_get_current_user();
+                                $this->_screen_settings = '<h5>' . __( 'Keyboard Shortcuts' ) . '</h5>'
+                                        . '<p><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" ' . ( ! empty( $current_user->comment_shortcuts ) ? checked( 'true', $current_user->comment_shortcuts, false ) : '' ) . ' />'
+                                        . __( 'Enable keyboard shortcuts for comment moderation.' ) . '</label> ' . __( '<a href="http://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>' ) . "</p>\n";
+                                break;
                         case 'widgets':
                                 $this->_screen_settings = '<p><a id="access-on" href="widgets.php?widgets-access=on">' . __('Enable accessibility mode') . '</a><a id="access-off" href="widgets.php?widgets-access=off">' . __('Disable accessibility mode') . "</a></p>\n";
                                 break;

wp-admin/includes/user.php

@@ -96 +96 @@
                 $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
         }
 
-        $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
-
         $user->use_ssl = 0;
         if ( !empty($_POST['use_ssl']) )
                 $user->use_ssl = 1;

wp-admin/js/edit-comments.js

@@ -601 +601 @@
                         prev_page_link_cb: make_hotkeys_redirect('prev'), next_page_link_cb: make_hotkeys_redirect('next') }
                 );
         }
+
+        $('#comment_shortcuts').change( function() {
+                $.post( ajaxurl, {
+                        action: 'comment-shortcuts',
+                        comment_shortcuts: this.checked ? 1 : 0,
+                        screenoptionnonce: $('#screenoptionnonce').val()
+                });
+        });
 });
 
 })(jQuery);

wp-admin/user-edit.php

@@ -37 +37 @@
         $parent_file = 'profile.php';
 
 $profile_help = '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
-        '<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
+        '<p>' . __('You can change your password, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
         '<p>' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '</p>' .
         '<p>' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '</p>' .
         '<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>';
@@ -213 +213 @@
 <th scope="row"><?php _e('Admin Color Scheme')?></th>
 <td><?php do_action( 'admin_color_scheme_picker' ); ?></td>
 </tr>
-<?php
-endif; // $_wp_admin_css_colors
-if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
-<tr>
-<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( !empty($profileuser->comment_shortcuts) ) checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="http://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
-</tr>
-<?php endif; ?>
+<?php endif; // $_wp_admin_css_colors ?>
 <tr class="show-admin-bar">
 <th scope="row"><?php _e('Toolbar')?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Toolbar') ?></span></legend>