Ticket #34133: 34133.diff

src/wp-admin/comment.php

@@ -81 +81 @@
 
         $comment_id = absint( $_GET['c'] );
 
-        if ( !$comment = get_comment_to_edit( $comment_id ) ) {
+        if ( !$comment = get_comment( $comment_id ) ) {
                 wp_redirect( admin_url('edit-comments.php?error=1') );
                 die();
         }
@@ -151 +151 @@
 <table class="form-table comment-ays">
 <tr>
 <th scope="row"><?php _e('Author'); ?></th>
-<td><?php echo $comment->comment_author; ?></td>
+<td><?php comment_author( $comment ); ?></td>
 </tr>
-<?php if ( $comment->comment_author_email ) { ?>
+<?php if ( get_comment_author_email( $comment ) ) { ?>
 <tr>
 <th scope="row"><?php _e('Email'); ?></th>
-<td><?php echo $comment->comment_author_email; ?></td>
+<td><?php comment_author_email( $comment ); ?></td>
 </tr>
 <?php } ?>
-<?php if ( $comment->comment_author_url ) { ?>
+<?php if ( get_comment_author_url( $comment ) ) { ?>
 <tr>
 <th scope="row"><?php _e('URL'); ?></th>
-<td><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></td>
+<td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
 </tr>
 <?php } ?>
 <tr>
@@ -195 +195 @@
         <th scope="row"><?php _e( 'Submitted on' ); ?></th>
         <td>
         <?php
-                /* translators: 2: comment date, 3: comment time */
-                printf( __( '<a href="%1$s">%2$s at %3$s</a>' ),
-                        esc_url( get_comment_link( $comment ) ),
+                /* translators: 1: comment date, 2: comment time */
+                $submitted = sprintf( __( '%1$s at %2$s' ),
                         /* translators: comment date format. See http://php.net/date */
                         get_comment_date( __( 'Y/m/d' ), $comment ),
                         get_comment_date( get_option( 'time_format' ), $comment )
                 );
+                if ( 'approved' === wp_get_comment_status( $comment ) ) {
+                        printf(
+                                '<a href="%s">%s</a>',
+                                esc_url( get_comment_link( $comment ) ),
+                                $submitted
+                        );
+                } else {
+                        echo $submitted;
+                }
         ?>
         </td>
 </tr>
 <tr>
 <th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
-<td><?php echo $comment->comment_content; ?></td>
+<td><?php comment_text( $comment ); ?></td>
 </tr>
 </table>