From f23199caaa8cc4b3ded72bff5b686c8a1ca9ce52 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Wed, 24 Jun 2015 20:56:27 +0000
Subject: [PATCH] Remove the `whois.arin.net` link from
 `wp_notify_postauthor()` and `wp_notify_moderator()`. Also, remove from
 `edit-form-comment.php` and add a new filter: `edit_comment_misc_actions`.

Props ozh, joedolson, rachelbaker.
Fixes #15281.

Built from https://develop.svn.wordpress.org/trunk@32929


git-svn-id: http://core.svn.wordpress.org/trunk@32900 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-form-comment.php | 18 ++++++++++++------
 wp-includes/pluggable.php      |  2 --
 wp-includes/version.php        |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 62cd828134..e563e7c80c 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -83,12 +83,6 @@ if ( !defined('ABSPATH') )
 <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>
 </fieldset>
 
-<?php if ( $ip = get_comment_author_IP() ) : ?>
-<div class="misc-pub-section misc-pub-comment-author-ip">
-	<span aria-hidden="true"><?php _e( 'IP address:' ); ?></span> <strong><a href="<?php echo esc_url( sprintf( 'http://whois.arin.net/rest/ip/%s', $ip ) ); ?>"> <span class="screen-reader-text"><?php _e( 'IP address:' ); ?> </span><?php echo esc_html( $ip ); ?></a></strong>
-</div>
-<?php endif; ?>
-
 <div class="misc-pub-section curtime misc-pub-curtime">
 <?php
 /* translators: Publish box date format, see http://php.net/date */
@@ -134,6 +128,18 @@ if ( $comment->comment_parent ) :
 </div>
 <?php endif; ?>
 
+<?php 
+	/**
+	 * Add additional miscellaneous actions to the edit comment form sidebar.
+	 *
+	 * @since 4.3.0
+	 *
+	 * @param string Output HTML to display miscellaneous action.
+	 * @param object $comment Current comment object.
+	 */
+	 echo apply_filters( 'edit_comment_misc_actions', '', $comment );
+?>
+
 </div> <!-- misc actions -->
 <div class="clear"></div>
 </div>
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 586e707067..06cfee79f3 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -1462,7 +1462,6 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) {
 			$notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
 			$notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n";
 			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __( 'Whois: %s' ), "http://whois.arin.net/rest/ip/{$comment->comment_author_IP}" ) . "\r\n";
 			$notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
 			$notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
 			/* translators: 1: blog name, 2: post title */
@@ -1593,7 +1592,6 @@ function wp_notify_moderator($comment_id) {
 			$notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
 			$notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n";
 			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __( 'Whois: %s' ), "http://whois.arin.net/rest/ip/{$comment->comment_author_IP}" ) . "\r\n";
 			$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
 			break;
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 38ac1f4ccf..60020b7d1d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32928';
+$wp_version = '4.3-alpha-32929';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.