Changeset 34006

Timestamp:

09/10/2015 05:48:34 PM (9 years ago)

Author:

wonderboymusic

Message:

Add a "View" row action for approved comments on the Dashboard screen, remove the link labeled #.

Props rachelbaker, zeo.
Fixes #18885.

File:

• trunk/src/wp-admin/includes/dashboard.php (modified) (5 diffs)

trunk/src/wp-admin/includes/dashboard.php

@@ -566 +566 @@
     }
 
-    $comment_link = '<a class="comment-link" href="' . esc_url(get_comment_link()) . '">#</a>';
-
     $actions_string = '';
     if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
@@ -576 +574 @@
             'edit' => '',
             'spam' => '',
-            'trash' => '', 'delete' => ''
+            'trash' => '', 'delete' => '',
+            'view' => '',
         );
 
@@ -593 +592 @@
         $actions['reply'] = '<a onclick="window.commentReply && commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.esc_attr__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
         $actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
-        if ( !EMPTY_TRASH_DAYS )
+
+        if ( ! EMPTY_TRASH_DAYS ) {
             $actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
-        else
+        } else {
             $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' title='" . 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() ) . '">' . _x( 'View', 'verb' ) . '</a>';
+        }
 
         /**
@@ -635 +640 @@
             <h4 class="comment-meta">
                 <?php printf( /* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */__( 'From %1$s on %2$s%3$s' ),
-                    '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link.' '.$comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?>
+                    '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?>
             </h4>
 
@@ -654 +659 @@
             <div class="dashboard-comment-wrap has-row-actions">
             <?php /* translators: %1$s is type of comment, %2$s is link to the post */ ?>
-            <h4 class="comment-meta"><?php printf( _x( '%1$s on %2$s', 'dashboard' ), "<strong>$type</strong>", $comment_post_link." ".$comment_link ); ?></h4>
+            <h4 class="comment-meta"><?php printf( _x( '%1$s on %2$s', 'dashboard' ), "<strong>$type</strong>", $comment_post_link ); ?></h4>
             <p class="comment-author"><?php comment_author_link(); ?></p>