X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/7f1521bf193b382565eb753043c161f4cb3fcda7..d3947bc013df7edd54b46deed8230d2eeafc5ecb:/wp-admin/comment.php?ds=sidebyside diff --git a/wp-admin/comment.php b/wp-admin/comment.php index c2487335..ba700ba6 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -12,6 +12,9 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); $parent_file = 'edit-comments.php'; $submenu_file = 'edit-comments.php'; +/** + * @global string $action + */ global $action; wp_reset_vars( array('action') ); @@ -30,17 +33,6 @@ if ( isset( $_GET['dt'] ) ) { $action = 'trash'; } -/** - * Display error message at bottom of comments. - * - * @param string $msg Error Message. Assumed to contain HTML and be sanitized. - */ -function comment_footer_die( $msg ) { - echo "
$msg
' . $message . '
' . $message . '
+
- | comment_author; ?> | +|||
---|---|---|---|---|
- | comment_author_email; ?> | ++ | ||
- | comment_author_url; ?> | +|||
+ | comment_post_ID; @@ -188,9 +180,13 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved if ( $comment->comment_parent ) { $parent = get_comment( $comment->comment_parent ); - $parent_link = esc_url( get_comment_link( $comment->comment_parent ) ); - $name = get_comment_author( $parent->comment_ID ); - printf( ' | ' . __( 'In reply to %2$s.' ), $parent_link, $name ); + $parent_link = esc_url( get_comment_link( $parent ) ); + $name = get_comment_author( $parent ); + printf( + /* translators: %s: comment link */ + ' | ' . __( 'In reply to %s.' ), + '' . $name . '' + ); } ?> | @@ -199,19 +195,26 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved%2$s at %3$s' ), - esc_url( get_comment_link( $comment->comment_ID ) ), + /* 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' ) ), - get_comment_date( get_option( 'time_format' ) ) + get_comment_date( __( 'Y/m/d' ), $comment ), + get_comment_date( __( 'g:i a' ), $comment ) ); + if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) { + echo '' . $submitted . ''; + } else { + echo $submitted; + } ?> | ||
- | comment_content; ?> | ++ + + |