WordPress.org
Get WordPress

Make WordPress Core

Ticket #40382: 40382-3.diff

File 40382-3.diff, 15.7 KB (added by bradparbs, 9 years ago)

Fix incorrect usage of "address's" (for real this time)

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

    diff --git src/wp-admin/options-discussion.php src/wp-admin/options-discussion.php
index fefc0d82df..5a71df3e66 100644
    printf( __('Comments should be displayed with the %s comments at the top of each 
    152152<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
    153153<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>
    154154
    155 <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>
     155<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP address, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
    156156<p>
    157157<textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
    158158</p>
    … … printf( __('Comments should be displayed with the %s comments at the top of each 
    161161<tr>
    162162<th scope="row"><?php _e('Comment Blacklist'); ?></th>
    163163<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
    164 <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>
     164<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP address, it will be put in the trash. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
    165165<p>
    166166<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
    167167</p>

  • src/wp-includes/Requests/IPv6.php 

    diff --git src/wp-includes/Requests/IPv6.php src/wp-includes/Requests/IPv6.php
index 204dbd7e66..248e156bed 100644
    class Requests_IPv6 { 
    8383         * @return string The compressed IPv6 address
    8484         */
    8585        public static function compress($ip) {
    86                 // Prepare the IP to be compressed
     86                // Prepare the IP address to be compressed
    8787                $ip = self::uncompress($ip);
    8888                $ip_parts = self::split_v6_v4($ip);
    8989
    … … class Requests_IPv6 { 
    139139        /**
    140140         * Checks an IPv6 address
    141141         *
    142          * Checks if the given IP is a valid IPv6 address
     142         * Checks if the given IP address is a valid IPv6 address
    143143         *
    144144         * @param string $ip An IPv6 address
    145145         * @return bool true if $ip is a valid IPv6 address

  • src/wp-includes/SimplePie/Net/IPv6.php 

    diff --git src/wp-includes/SimplePie/Net/IPv6.php src/wp-includes/SimplePie/Net/IPv6.php
index da80d8acac..a814609312 100644
    class SimplePie_Net_IPv6 
    146146         */
    147147        public static function compress($ip)
    148148        {
    149                 // Prepare the IP to be compressed
     149                // Prepare the IP address to be compressed
    150150                $ip = self::uncompress($ip);
    151151                $ip_parts = self::split_v6_v4($ip);
    152152

  • src/wp-includes/class-http.php 

    diff --git src/wp-includes/class-http.php src/wp-includes/class-http.php
index b9f5ab50fb..668f5f7c4f 100644
    class WP_Http { 
    994994         *
    995995         * This function also detects the type of the IP address, returning either
    996996         * '4' or '6' to represent a IPv4 and IPv6 address respectively.
    997          * This does not verify if the IP is a valid IP, only that it appears to be
     997         * This does not verify if the IP address is a valid IP address, only that it appears to be
    998998         * an IP address.
    999999         *
    10001000         * @link http://home.deds.nl/~aeron/regex/ for IPv6 regex

  • src/wp-includes/class-smtp.php 

    diff --git src/wp-includes/class-smtp.php src/wp-includes/class-smtp.php
index 3ad081926a..6fea9afafe 100644
    class SMTP 
    248248
    249249    /**
    250250     * Connect to an SMTP server.
    251      * @param string $host SMTP server IP or host name
     251     * @param string $host SMTP server IP address or host name
    252252     * @param integer $port The port number to connect to
    253253     * @param integer $timeout How long to wait for the connection to open
    254254     * @param array $options An array of options for stream_context_create()
    … … class SMTP 
    658658     * This makes sure that client and server are in a known state.
    659659     * Implements RFC 821: HELO <SP> <domain> <CRLF>
    660660     * and RFC 2821 EHLO.
    661      * @param string $host The host name or IP to connect to
     661     * @param string $host The host name or IP address to connect to
    662662     * @access public
    663663     * @return boolean
    664664     */

  • src/wp-includes/class-wp-http-streams.php 

    diff --git src/wp-includes/class-wp-http-streams.php src/wp-includes/class-wp-http-streams.php
index 2f10c67598..ece47d3064 100644
    class WP_Http_Streams { 
    340340                        return false;
    341341
    342342                /*
    343                  * If the request is being made to an IP address, we'll validate against IP fields
     343                 * If the request is being made to an IP address, we'll validate against IP address fields
    344344                 * in the cert (if they exist)
    345345                 */
    346346                $host_type = ( WP_Http::is_ip_address( $host ) ? 'ip' : 'dns' );
    … … class WP_Http_Streams { 
    350350                        $match_against = preg_split( '/,\s*/', $cert['extensions']['subjectAltName'] );
    351351                        foreach ( $match_against as $match ) {
    352352                                list( $match_type, $match_host ) = explode( ':', $match );
    353                                 if ( $host_type == strtolower( trim( $match_type ) ) ) // IP: or DNS:
     353                                if ( $host_type == strtolower( trim( $match_type ) ) ) // IP address: or DNS:
    354354                                        $certificate_hostnames[] = strtolower( trim( $match_host ) );
    355355                        }
    356356                } elseif ( !empty( $cert['subject']['CN'] ) ) {
    … … class WP_Http_Streams { 
    358358                        $certificate_hostnames[] = strtolower( $cert['subject']['CN'] );
    359359                }
    360360
    361                 // Exact hostname/IP matches.
     361                // Exact hostname/IP address matches.
    362362                if ( in_array( strtolower( $host ), $certificate_hostnames ) )
    363363                        return true;
    364364
    365                 // IP's can't be wildcards, Stop processing.
     365                // IP address can't be wildcards, Stop processing.
    366366                if ( 'ip' == $host_type )
    367367                        return false;
    368368

  • src/wp-includes/comment.php 

    diff --git src/wp-includes/comment.php src/wp-includes/comment.php
index 7398f99dd9..78eedb7985 100644
    function check_comment_flood_db() { 
    790790 * @global wpdb $wpdb WordPress database abstraction object.
    791791 *
    792792 * @param bool   $is_flood  Is a comment flooding occurring?
    793  * @param string $ip        Comment IP.
     793 * @param string $ip        Comment IP address.
    794794 * @param string $email     Comment author email address.
    795795 * @param string $date      MySQL time string.
    796796 * @param bool   $avoid_die When true, a disallowed comment will result in the function
    … … function wp_filter_comment($commentdata) { 
    18141814         */
    18151815        $commentdata['comment_content'] = apply_filters( 'pre_comment_content', $commentdata['comment_content'] );
    18161816        /**
    1817          * Filters the comment author's IP before it is set.
     1817         * Filters the comment author's IP address before it is set.
    18181818         *
    18191819         * @since 1.5.0
    18201820         *
    1821          * @param string $comment_author_ip The comment author's IP.
     1821         * @param string $comment_author_ip The comment author's IP address.
    18221822         */
    18231823        $commentdata['comment_author_IP'] = apply_filters( 'pre_comment_user_ip', $commentdata['comment_author_IP'] );
    18241824        /** This filter is documented in wp-includes/comment.php */

  • src/wp-includes/http.php 

    diff --git src/wp-includes/http.php src/wp-includes/http.php
index 3e26b08fd8..8159b39386 100644
    function wp_http_validate_url( $url ) { 
    559559                                 * @since 3.6.0
    560560                                 *
    561561                                 * @param bool   false Whether HTTP request is external or not.
    562                                  * @param string $host IP of the requested host.
     562                                 * @param string $host IP address of the requested host.
    563563                                 * @param string $url  URL of the requested host.
    564564                                 */
    565565                                if ( ! apply_filters( 'http_request_host_is_external', false, $host, $url ) )

  • src/wp-includes/ms-functions.php 

    diff --git src/wp-includes/ms-functions.php src/wp-includes/ms-functions.php
index 9df86cfbde..742fdde7eb 100644
    function newuser_notify_siteadmin( $user_id ) { 
    12801280        $options_site_url = esc_url(network_admin_url('settings.php'));
    12811281        /* translators: New user notification email. 1: User login, 2: User IP address, 3: Settings screen URL */
    12821282        $msg = sprintf(__('New User: %1$s
    1283 Remote IP: %2$s
     1283Remote IP address: %2$s
    12841284
    12851285Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
    12861286

  • src/wp-includes/pluggable.php 

    diff --git src/wp-includes/pluggable.php src/wp-includes/pluggable.php
index 2b9d912958..d01a5faf00 100644
    function wp_notify_postauthor( $comment_id, $deprecated = null ) { 
    14581458                case 'trackback':
    14591459                        /* translators: 1: Post title */
    14601460                        $notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
    1461                         /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
    1462                         $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1461                        /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1462                        $notify_message .= sprintf( __('Website: %1$s (IP address: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    14631463                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    14641464                        $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
    14651465                        $notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n";
    … … function wp_notify_postauthor( $comment_id, $deprecated = null ) { 
    14691469                case 'pingback':
    14701470                        /* translators: 1: Post title */
    14711471                        $notify_message  = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
    1472                         /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
    1473                         $notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1472                        /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1473                        $notify_message .= sprintf( __('Website: %1$s (IP address: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    14741474                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    14751475                        $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
    14761476                        $notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n";
    … … function wp_notify_postauthor( $comment_id, $deprecated = null ) { 
    14791479                        break;
    14801480                default: // Comments
    14811481                        $notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
    1482                         /* translators: 1: comment author, 2: author IP, 3: author domain */
    1483                         $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1482                        /* translators: 1: comment author, 2: author IP address, 3: author domain */
     1483                        $notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    14841484                        $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
    14851485                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    14861486                        $notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
    … … function wp_notify_moderator($comment_id) { 
    16191619                        /* translators: 1: Post title */
    16201620                        $notify_message  = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
    16211621                        $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
    1622                         /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
    1623                         $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1622                        /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1623                        $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    16241624                        /* translators: 1: Trackback/pingback/comment author URL */
    16251625                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    16261626                        $notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n";
    … … function wp_notify_moderator($comment_id) { 
    16291629                        /* translators: 1: Post title */
    16301630                        $notify_message  = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
    16311631                        $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
    1632                         /* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
    1633                         $notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1632                        /* translators: 1: Trackback/pingback website name, 2: website IP address, 3: website hostname */
     1633                        $notify_message .= sprintf( __( 'Website: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    16341634                        /* translators: 1: Trackback/pingback/comment author URL */
    16351635                        $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    16361636                        $notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n";
    … … function wp_notify_moderator($comment_id) { 
    16391639                        /* translators: 1: Post title */
    16401640                        $notify_message  = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
    16411641                        $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
    1642                         /* translators: 1: Comment author name, 2: comment author's IP, 3: comment author IP's hostname */
    1643                         $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
     1642                        /* translators: 1: Comment author name, 2: comment author's IP address, 3: comment author IP address hostname */
     1643                        $notify_message .= sprintf( __( 'Author: %1$s (IP address: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    16441644                        /* translators: 1: Comment author URL */
    16451645                        $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
    16461646                        /* translators: 1: Trackback/pingback/comment author URL */