X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8ab4a4532479e8db471032b51042ec8c4716d091..c81aba3d563f7459dc79140e4c5be67bcf506b92:/wp-admin/comment.php
diff --git a/wp-admin/comment.php b/wp-admin/comment.php
index c2487335..939f77ee 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 "
-
+
comment_approved != '0' ) { // if not unapproved
comment_author_email ) { ?>
- |
+ |
comment_author_email; ?> |
@@ -174,7 +166,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
- |
+ |
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 . ''
+ );
}
?>
|
@@ -198,15 +194,14 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved
|
- %2$s at %3$s' ),
- esc_url( get_comment_link( $comment->comment_ID ) ),
- /* translators: comment date format. See http://php.net/date */
- get_comment_date( __( 'Y/m/d' ) ),
- get_comment_date( get_option( 'time_format' ) )
- );
- ?>
+
|
@@ -249,7 +244,7 @@ case 'unapprovecomment' :
$noredir = isset($_REQUEST['noredir']);
if ( !$comment = get_comment($comment_id) )
- comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' ' . __('Go back') . '.', 'edit-comments.php') );
+ comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' ' . __('Go back') . '.', '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.') );
@@ -266,31 +261,31 @@ case 'unapprovecomment' :
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;
}