WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dashboard: toggle the "View" link for comments when Approving / Unapproving from the Dashboard widget. 

Fixes #35518.

Built from https://develop.svn.wordpress.org/trunk@37302


git-svn-id: http://core.svn.wordpress.org/trunk@37268 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2016-04-22 21:30:28 +00:00
parent 59d388038e
commit be59d289b7
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/includes/dashboard.php
View File

@ -630,9 +630,7 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='" . esc_attr__( 'Move this comment to the Trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>'; $actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='" . esc_attr__( 'Move this comment to the Trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
} }
if ( '1' === $comment->comment_approved ) {
$actions['view'] = '<a class="comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '" aria-label="' . esc_attr__( 'View this comment' ) . '">' . __( 'View' ) . '</a>'; $actions['view'] = '<a class="comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '" aria-label="' . esc_attr__( 'View this comment' ) . '">' . __( 'View' ) . '</a>';
}
/** /**
* Filter the action links displayed for each comment in the 'Recent Comments' * Filter the action links displayed for each comment in the 'Recent Comments'
@ -653,9 +651,13 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | '; ( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
// Reply and quickedit need a hide-if-no-js span // Reply and quickedit need a hide-if-no-js span
if ( 'reply' == $action || 'quickedit' == $action ) if ( 'reply' == $action || 'quickedit' == $action ) {
$action .= ' hide-if-no-js'; $action .= ' hide-if-no-js';
}
if ( 'view' === $action && '1' !== $comment->comment_approved ) {
$action .= ' hidden';
}
$actions_string .= "<span class='$action'>$sep$link</span>"; $actions_string .= "<span class='$action'>$sep$link</span>";
} }
} }

7
wp-admin/js/edit-comments.js
View File

@ -220,12 +220,15 @@ setCommentsList = function() {
if ( settings.data.id == replyID ) if ( settings.data.id == replyID )
replyButton.text(adminCommentsL10n.replyApprove); replyButton.text(adminCommentsL10n.replyApprove);
c.find('div.comment_status').html('0'); c.find( '.row-actions span.view' ).addClass( 'hidden' ).end()
.find( 'div.comment_status' ).html( '0' );
} else { } else {
if ( settings.data.id == replyID ) if ( settings.data.id == replyID )
replyButton.text(adminCommentsL10n.reply); replyButton.text(adminCommentsL10n.reply);
c.find('div.comment_status').html('1'); c.find( '.row-actions span.view' ).removeClass( 'hidden' ).end()
.find( 'div.comment_status' ).html( '1' );
} }
diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1; diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;

2
wp-admin/js/edit-comments.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37301'; $wp_version = '4.6-alpha-37302';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.