Changeset 41704

Timestamp:

10/03/2017 01:08:48 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Comments: Change IP references in moderation option labels and email notifications to IP address for clarity.

Props mako09, gk.loveweb, bradparbs.
Fixes #40382.

Location:

trunk/src

Files:

• wp-admin/options-discussion.php (modified) (2 diffs)
• wp-includes/comment.php (modified) (3 diffs)
• wp-includes/pluggable.php (modified) (6 diffs)

trunk/src/wp-admin/options-discussion.php

@@ -158 +158 @@
 <p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
 
-<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
+<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
 <textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
@@ -167 +167 @@
 <th scope="row"><?php _e('Comment Blacklist'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
-<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be put in the trash. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
+<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
 <textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>

trunk/src/wp-includes/comment.php

@@ -791 +791 @@
  *
  * @param bool   $is_flood  Is a comment flooding occurring?
- * @param string $ip        Comment IP.
- * @param string $email     Comment author email address.
+ * @param string $ip        Comment .
+ * @param string $email     Comment author email address.
  * @param string $date      MySQL time string.
  * @param bool   $avoid_die When true, a disallowed comment will result in the function
@@ -1157 +1157 @@
  * @param string $url The url used in the comment
  * @param string $comment The comment content
- * @param string $user_ip The comment author IP address
+ * @param string $user_ip The comment author IP address
  * @param string $user_agent The author's browser user agent
  * @return bool True if comment contains blacklisted content, false if comment does not
@@ -1835 +1835 @@
     $commentdata['comment_content'] = apply_filters( 'pre_comment_content', $commentdata['comment_content'] );
     /**
-     * Filters the comment author's IP before it is set.
+     * Filters the comment author's IP before it is set.
      *
      * @since 1.5.0
      *
-     * @param string $comment_author_ip The comment author's IP.
+     * @param string $comment_author_ip The comment author's IP.
      */
     $commentdata['comment_author_IP'] = apply_filters( 'pre_comment_user_ip', $commentdata['comment_author_IP'] );

trunk/src/wp-includes/pluggable.php

@@ -1470 +1470 @@
             /* translators: 1: Post title */
             $notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
-            /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-            $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+            /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
+            $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
             $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
             $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
@@ -1481 +1481 @@
             /* translators: 1: Post title */
             $notify_message  = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
-            /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-            $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+            /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
+            $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
             $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
             $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
@@ -1491 +1491 @@
         default: // Comments
             $notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
-            /* translators: 1: comment author, 2: author IP, 3: author domain */
-            $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+            /* translators: 1: comment author, 2:  */
+            $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( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
             $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
@@ -1631 +1631 @@
             $notify_message  = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
             $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-            /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-            $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+            /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
+            $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
             /* translators: 1: Trackback/pingback/comment author URL */
             $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
@@ -1641 +1641 @@
             $notify_message  = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
             $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-            /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-            $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+            /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
+            $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
             /* translators: 1: Trackback/pingback/comment author URL */
             $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
@@ -1651 +1651 @@
             $notify_message  = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
             $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
-            /* translators: 1: Comment author name, 2: comment author's IP, 3: comment author IP's hostname */
-            $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+            /* translators: 1: Comment author name, 2: comment author's IP's hostname */
+            $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
             /* translators: 1: Comment author URL */
             $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";