$parent_file = 'edit-comments.php';
$submenu_file = 'edit-comments.php';
+/**
+ * @global string $action
+ */
+global $action;
wp_reset_vars( array('action') );
if ( isset( $_POST['deletecomment'] ) )
$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 "<div class='wrap'><p>$msg</p></div>";
- include( ABSPATH . 'wp-admin/admin-footer.php' );
- die;
-}
-
switch( $action ) {
case 'editcomment' :
get_current_screen()->set_help_sidebar(
'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
- '<p>' . __( '<a href="http://codex.wordpress.org/Administration_Screens#Comments" target="_blank">Documentation on Comments</a>' ) . '</p>' .
- '<p>' . __( '<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+ '<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments" target="_blank">Documentation on Comments</a>' ) . '</p>' .
+ '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
);
wp_enqueue_script('comment');
$comment_id = absint( $_GET['c'] );
if ( !$comment = get_comment( $comment_id ) )
- comment_footer_die( __(
'Oops, no comment with this ID.') . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+ comment_footer_die( __(
'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
if ( !current_user_can( 'edit_comment', $comment_id ) )
comment_footer_die( __('You are not allowed to edit this comment.') );
$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();
}
$nonce_action .= $comment_id;
?>
-<div class='wrap'>
-
-<div class="narrow">
+<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
+<h1><?php echo esc_html( $title ); ?></h1>
<?php
switch ( $action ) {
case 'spam' :
$caution_msg = __('You are about to mark the following comment as spam:');
- $button = __('Spam Comment');
+ $button = _x( 'Mark as Spam', 'comment' );
break;
case 'trash' :
$caution_msg = __('You are about to move the following comment to the Trash:');
- $button = __('Trash Comment');
+ $button = __('Move to Trash');
break;
case 'delete' :
$caution_msg = __('You are about to delete the following comment:');
$message = __('This comment is currently in the Trash.');
break;
}
- if ( $message )
- echo '<div class="updated"><p>' . $message . '</p></div>';
+ if ( $message ) {
+ echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
+ }
}
?>
-<p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
+<div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>
<table class="form-table comment-ays">
-<tr class="alt">
+<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('E-mail'); ?></th>
-<td><?php echo $comment->comment_author_email; ?></td>
+<th scope="row"><?php _e('Email'); ?></th>
+<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>
-<th scope="row" valign="top"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
-<td><?php echo $comment->comment_content; ?></td>
+ <th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
+ <td>
+ <?php
+ $post_id = $comment->comment_post_ID;
+ if ( current_user_can( 'edit_post', $post_id ) ) {
+ $post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+ $post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+ } else {
+ $post_link = esc_html( get_the_title( $post_id ) );
+ }
+ echo $post_link;
+
+ if ( $comment->comment_parent ) {
+ $parent = get_comment( $comment->comment_parent );
+ $parent_link = esc_url( get_comment_link( $parent ) );
+ $name = get_comment_author( $parent );
+ printf(
+ /* translators: %s: comment link */
+ ' | ' . __( 'In reply to %s.' ),
+ '<a href="' . $parent_link . '">' . $name . '</a>'
+ );
+ }
+ ?>
+ </td>
</tr>
-</table>
-
-<p><?php _e('Are you sure you want to do this?'); ?></p>
-
-<form action='comment.php' method='get'>
-
-<table width="100%">
<tr>
-<td><a class="button" href="<?php echo admin_url('edit-comments.php'); ?>"><?php esc_attr_e('No'); ?></a></td>
-<td class="textright"><?php submit_button( $button, 'button' ); ?></td>
+ <th scope="row"><?php _e( 'Submitted on' ); ?></th>
+ <td>
+ <?php
+ /* 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( __( 'g:i a' ), $comment )
+ );
+ if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
+ echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
+ } else {
+ echo $submitted;
+ }
+ ?>
+ </td>
+</tr>
+<tr>
+<th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
+<td class="comment-content">
+ <?php comment_text( $comment ); ?>
+ <p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&c={$comment->comment_ID}" ); ?>"><?php esc_attr_e( 'Edit' ); ?></a></p>
+</td>
</tr>
</table>
+<form action="comment.php" method="get" class="comment-ays-submit">
+
+<p>
+ <?php submit_button( $button, 'primary', 'submit', false ); ?>
+ <a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_attr_e( 'Cancel' ); ?></a>
+</p>
+
<?php wp_nonce_field( $nonce_action ); ?>
-<input type='hidden' name='action' value='<?php echo esc_attr($formaction); ?>' />
-<input type='hidden' name='c' value='<?php echo esc_attr($comment->comment_ID); ?>' />
-<input type='hidden' name='noredir' value='1' />
+<input type="hidden" name="action" value="<?php echo esc_attr($formaction); ?>" />
+<input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID); ?>" />
+<input type="hidden" name="noredir" value="1" />
</form>
-</div>
</div>
<?php
break;
$noredir = isset($_REQUEST['noredir']);
if ( !$comment = get_comment($comment_id) )
- comment_footer_die( __(
'Oops, no comment with this ID.') . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
+ comment_footer_die( __(
'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
comment_footer_die( __('You are not allowed to edit comments on this post.') );
switch ( $action ) {
case 'deletecomment' :
- wp_delete_comment( $comment_id );
+ wp_delete_comment( $comment );
$redir = add_query_arg( array('deleted' => '1'), $redir );
break;
case 'trashcomment' :
- wp_trash_comment($comment_id);
+ wp_trash_comment( $comment );
$redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
break;
case 'untrashcomment' :
- wp_untrash_comment($comment_id);
+ wp_untrash_comment( $comment );
$redir = add_query_arg( array('untrashed' => '1'), $redir );
break;
case 'spamcomment' :
- wp_spam_comment($comment_id);
+ wp_spam_comment( $comment );
$redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
break;
case 'unspamcomment' :
- wp_unspam_comment($comment_id);
+ wp_unspam_comment( $comment );
$redir = add_query_arg( array('unspammed' => '1'), $redir );
break;
case 'approvecomment' :
- wp_set_comment_status( $comment_id, 'approve' );
+ wp_set_comment_status( $comment, 'approve' );
$redir = add_query_arg( array( 'approved' => 1 ), $redir );
break;
case 'unapprovecomment' :
- wp_set_comment_status( $comment_id, 'hold' );
+ wp_set_comment_status( $comment, 'hold' );
$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
break;
}
wp_redirect( $redir );
die;
- break;
case 'editedcomment' :
wp_redirect( $location );
exit();
- break;
default:
wp_die( __('Unknown action.') );
- break;
} // end switch
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff