WordPress.org

Make WordPress Core

Ticket #34133: 34133.5.diff

File 34133.5.diff, 6.3 KB (added by afercia, 4 years ago)
  • src/wp-admin/comment.php

     
    8181
    8282        $comment_id = absint( $_GET['c'] );
    8383
    84         if ( !$comment = get_comment_to_edit( $comment_id ) ) {
     84        if ( ! $comment = get_comment( $comment_id ) ) {
    8585                wp_redirect( admin_url('edit-comments.php?error=1') );
    8686                die();
    8787        }
     
    142142                        break;
    143143        }
    144144        if ( $message ) {
    145                 echo '<div class="notice notice-info"><p>' . $message . '</p></div>';
     145                echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
    146146        }
    147147}
    148148?>
    149 <p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p>
     149<div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>
    150150
    151151<table class="form-table comment-ays">
    152152<tr>
    153153<th scope="row"><?php _e('Author'); ?></th>
    154 <td><?php echo $comment->comment_author; ?></td>
     154<td><?php comment_author( $comment ); ?></td>
    155155</tr>
    156 <?php if ( $comment->comment_author_email ) { ?>
     156<?php if ( get_comment_author_email( $comment ) ) { ?>
    157157<tr>
    158158<th scope="row"><?php _e('Email'); ?></th>
    159 <td><?php echo $comment->comment_author_email; ?></td>
     159<td><?php comment_author_email( $comment ); ?></td>
    160160</tr>
    161161<?php } ?>
    162 <?php if ( $comment->comment_author_url ) { ?>
     162<?php if ( get_comment_author_url( $comment ) ) { ?>
    163163<tr>
    164164<th scope="row"><?php _e('URL'); ?></th>
    165 <td><a href="<?php echo $comment->comment_author_url; ?>"><?php echo $comment->comment_author_url; ?></a></td>
     165<td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
    166166</tr>
    167167<?php } ?>
    168168<tr>
     
    194194<tr>
    195195        <th scope="row"><?php _e( 'Submitted on' ); ?></th>
    196196        <td>
    197                 <a href="<?php echo esc_url( get_comment_link( $comment ) ); ?>"><?php
    198                         /* translators: 1: comment date, 2: comment time */
    199                         printf( __( '%1$s at %2$s' ),
    200                                 /* translators: comment date format. See http://php.net/date */
    201                                 get_comment_date( __( 'Y/m/d' ), $comment ),
    202                                 get_comment_date( __( 'g:i a' ), $comment )
    203                         );
    204                 ?></a>
     197        <?php
     198                /* translators: 1: comment date, 2: comment time */
     199                $submitted = sprintf( __( '%1$s at %2$s' ),
     200                        /* translators: comment date format. See http://php.net/date */
     201                        get_comment_date( __( 'Y/m/d' ), $comment ),
     202                        get_comment_date( __( 'g:i a' ), $comment )
     203                );
     204                if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
     205                        echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
     206                } else {
     207                        echo $submitted;
     208                }
     209        ?>
    205210        </td>
    206211</tr>
    207212<tr>
    208213<th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
    209 <td><?php echo $comment->comment_content; ?></td>
     214<td>
     215        <?php echo $comment->comment_content; ?>
     216        <p><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_attr_e( 'Edit' ); ?></a></p>
     217</td>
    210218</tr>
    211219</table>
    212220
  • src/wp-admin/css/edit.css

     
    11481148        padding: 10px 15px;
    11491149}
    11501150
     1151.comment-ays td p:last-of-type {
     1152        margin-top: 10px;
     1153}
     1154
    11511155.comment-ays-submit .button-cancel {
    11521156        margin-left: 1em;
    11531157}
  • src/wp-includes/pluggable.php

     
    14991499
    15001500        if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
    15011501                if ( EMPTY_TRASH_DAYS ) {
    1502                         $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c={$comment->comment_ID}") ) . "\r\n";
     1502                        $notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
    15031503                } else {
    1504                         $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c={$comment->comment_ID}") ) . "\r\n";
     1504                        $notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
    15051505                }
    1506                 $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c={$comment->comment_ID}") ) . "\r\n";
     1506                $notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
    15071507        }
    15081508
    15091509        $wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
     
    16401640                        break;
    16411641        }
    16421642
    1643         $notify_message .= sprintf( __('Approve it: %s'),  admin_url("comment.php?action=approve&c=$comment_id") ) . "\r\n";
     1643        $notify_message .= sprintf( __( 'Approve it: %s' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n";
     1644
    16441645        if ( EMPTY_TRASH_DAYS )
    1645                 $notify_message .= sprintf( __('Trash it: %s'), admin_url("comment.php?action=trash&c=$comment_id") ) . "\r\n";
     1646                $notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
    16461647        else
    1647                 $notify_message .= sprintf( __('Delete it: %s'), admin_url("comment.php?action=delete&c=$comment_id") ) . "\r\n";
    1648         $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=spam&c=$comment_id") ) . "\r\n";
     1648                $notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n";
    16491649
     1650        $notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment_id}#wpbody-content" ) ) . "\r\n";
     1651
    16501652        $notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
    16511653                'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
    1652         $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n";
     1654        $notify_message .= admin_url( "edit-comments.php?comment_status=moderated#wpbody-content" ) . "\r\n";
    16531655
    16541656        $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title );
    16551657        $message_headers = '';