WordPress 4.0.1-scripts

[autoinstalls/wordpress.git] / wp-admin / edit-form-comment.php

diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 14a2966804d00b003c73dd09d0057a011269ab55..b2950f77b529162093a5b1eb32ca1c9814f34d1e 100644 (file)
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -13,7 +13,6 @@ if ( !defined('ABSPATH') )
 <form name="post" action="comment.php" method="post" id="post">
 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">
 <form name="post" action="comment.php" method="post" id="post">
 <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">

-<?php screen_icon(); ?>

 <h2><?php _e('Edit Comment'); ?></h2>
 
 <div id="poststuff">
 <h2><?php _e('Edit Comment'); ?></h2>
 
 <div id="poststuff">


@@ -23,17 +22,17 @@ if ( !defined('ABSPATH') )
 <input type="hidden" name="comment_post_ID" value="<?php echo esc_attr( $comment->comment_post_ID ); ?>" />
 
 <div id="post-body" class="metabox-holder columns-2">
 <input type="hidden" name="comment_post_ID" value="<?php echo esc_attr( $comment->comment_post_ID ); ?>" />
 
 <div id="post-body" class="metabox-holder columns-2">

-<div id="post-body-content">
+<div id="post-body-content" class="edit-form-section">

 <div id="namediv" class="stuffbox">
 <h3><label for="name"><?php _e( 'Author' ) ?></label></h3>
 <div class="inside">
 <table class="form-table editcomment">
 <tbody>
 <div id="namediv" class="stuffbox">
 <h3><label for="name"><?php _e( 'Author' ) ?></label></h3>
 <div class="inside">
 <table class="form-table editcomment">
 <tbody>

-<tr valign="top">
+<tr>

        <td class="first"><?php _e( 'Name:' ); ?></td>
        <td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" id="name" /></td>
 </tr>
        <td class="first"><?php _e( 'Name:' ); ?></td>
        <td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" id="name" /></td>
 </tr>

-<tr valign="top">
+<tr>

        <td class="first">
        <?php
                if ( $comment->comment_author_email ) {
        <td class="first">
        <?php
                if ( $comment->comment_author_email ) {


@@ -44,12 +43,13 @@ if ( !defined('ABSPATH') )
 ?></td>
        <td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" /></td>
 </tr>
 ?></td>
        <td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" /></td>
 </tr>

-<tr valign="top">
+<tr>

        <td class="first">
        <?php
                if ( ! empty( $comment->comment_author_url ) && 'http://' != $comment->comment_author_url ) {
                        $link = '<a href="' . $comment->comment_author_url . '" rel="external nofollow" target="_blank">' . __('visit site') . '</a>';
        <td class="first">
        <?php
                if ( ! empty( $comment->comment_author_url ) && 'http://' != $comment->comment_author_url ) {
                        $link = '<a href="' . $comment->comment_author_url . '" rel="external nofollow" target="_blank">' . __('visit site') . '</a>';

-                       printf( __( 'URL (%s):' ), apply_filters('get_comment_author_link', $link ) );
+                       /** This filter is documented in wp-includes/comment-template.php */
+                       printf( __( 'URL (%s):' ), apply_filters( 'get_comment_author_link', $link ) );

                } else {
                        _e( 'URL:' );
                } ?></td>
                } else {
                        _e( 'URL:' );
                } ?></td>


@@ -63,7 +63,7 @@ if ( !defined('ABSPATH') )
 
 <div id="postdiv" class="postarea">
 <?php
 
 <div id="postdiv" class="postarea">
 <?php

-       $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,spell,close' );
+       $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );

        wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
        wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>
        wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
        wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
 </div>


@@ -71,7 +71,7 @@ if ( !defined('ABSPATH') )
 
 <div id="postbox-container-1" class="postbox-container">
 <div id="submitdiv" class="stuffbox" >
 
 <div id="postbox-container-1" class="postbox-container">
 <div id="submitdiv" class="stuffbox" >

-<h3><span class='hndle'><?php _e('Status') ?></span></h3>
+<h3><span class="hndle"><?php _e('Status') ?></span></h3>

 <div class="inside">
 <div class="submitbox" id="submitcomment">
 <div id="minor-publishing">
 <div class="inside">
 <div class="submitbox" id="submitcomment">
 <div id="minor-publishing">


@@ -85,15 +85,21 @@ if ( !defined('ABSPATH') )
 
 <div id="misc-publishing-actions">
 
 
 <div id="misc-publishing-actions">
 

-<div class="misc-pub-section" id="comment-status-radio">
+<div class="misc-pub-section misc-pub-comment-status" id="comment-status-radio">

 <label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php /* translators: comment type radio button */ _ex('Approved', 'adjective') ?></label><br />
 <label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php /* translators: comment type radio button */ _ex('Pending', 'adjective') ?></label><br />
 <label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php /* translators: comment type radio button */ _ex('Spam', 'adjective'); ?></label>
 </div>
 
 <label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php /* translators: comment type radio button */ _ex('Approved', 'adjective') ?></label><br />
 <label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php /* translators: comment type radio button */ _ex('Pending', 'adjective') ?></label><br />
 <label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php /* translators: comment type radio button */ _ex('Spam', 'adjective'); ?></label>
 </div>
 

-<div class="misc-pub-section curtime">
+<?php if ( $ip = get_comment_author_IP() ) : ?>
+<div class="misc-pub-section misc-pub-comment-author-ip">
+       <?php _e( 'IP address:' ); ?> <strong><a href="<?php echo esc_url( sprintf( 'http://whois.arin.net/rest/ip/%s', $ip ) ); ?>"><?php echo esc_html( $ip ); ?></a></strong>
+</div>
+<?php endif; ?>
+
+<div class="misc-pub-section curtime misc-pub-curtime">

 <?php
 <?php

-// translators: Publish box date format, see http://php.net/date
+/* translators: Publish box date format, see http://php.net/date */

 $datef = __( 'M j, Y @ G:i' );
 $stamp = __('Submitted on: <b>%1$s</b>');
 $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
 $datef = __( 'M j, Y @ G:i' );
 $stamp = __('Submitted on: <b>%1$s</b>');
 $date = date_i18n( $datef, strtotime( $comment->comment_date ) );


@@ -121,9 +127,17 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
 
 <div id="postbox-container-2" class="postbox-container">
 <?php
 
 <div id="postbox-container-2" class="postbox-container">
 <?php

+/** This action is documented in wp-admin/edit-form-advanced.php */
+do_action( 'add_meta_boxes', 'comment', $comment );

 
 

-do_action('add_meta_boxes', 'comment', $comment);
-do_action('add_meta_boxes_comment', $comment);
+/**
+ * Fires when comment-specific meta boxes are added.
+ *
+ * @since 3.0.0
+ *
+ * @param object $comment Comment object.
+ */
+do_action( 'add_meta_boxes_comment', $comment );

 
 do_meta_boxes(null, 'normal', $comment);
 
 
 do_meta_boxes(null, 'normal', $comment);
 


@@ -132,7 +146,7 @@ do_meta_boxes(null, 'normal', $comment);
 
 <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
 <input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />
 
 <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
 <input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />

-<input name="referredby" type="hidden" id="referredby" value="<?php echo esc_url(stripslashes(wp_get_referer())); ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo esc_url( wp_get_referer() ); ?>" />

 <?php wp_original_referer_field(true, 'previous'); ?>
 <input type="hidden" name="noredir" value="1" />
 
 <?php wp_original_referer_field(true, 'previous'); ?>
 <input type="hidden" name="noredir" value="1" />