diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index 77819cb49b..a739f622b8 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -239,16 +239,15 @@ function get_comment_author_link( $comment_id = 0 ) { * * @since 6.2.0 * - * @param string[] $rel_parts An array of strings representing the rel - * tags which will be joined into the anchor's - * rel attribute. - * @param WP_Comment $comment The comment object + * @param string[] $rel_parts An array of strings representing the rel tags + * which will be joined into the anchor's rel attribute. + * @param WP_Comment $comment The comment object. */ $rel_parts = apply_filters( 'comment_author_link_rel', $rel_parts, $comment ); $rel = implode( ' ', $rel_parts ); $rel = esc_attr( $rel ); - // empty space before rel necessary for later sprintf. + // Empty space before 'rel' is necessary for later sprintf(). $rel = ! empty( $rel ) ? sprintf( ' rel="%s"', $rel ) : ''; $return = sprintf( diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 7f27a02a44..1db0003be9 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -2918,8 +2918,8 @@ function _make_url_clickable_cb( $matches ) { } $rel_attr = _make_clickable_rel_attr( $url ); - return $matches[1] . "$url" . $suffix; + return $matches[1] . "{$url}" . $suffix; } /** @@ -2951,7 +2951,8 @@ function _make_web_ftp_clickable_cb( $matches ) { } $rel_attr = _make_clickable_rel_attr( $dest ); - return $matches[1] . "{$dest}{$ret}"; + + return $matches[1] . "{$dest}{$ret}"; } /** @@ -2967,7 +2968,8 @@ function _make_web_ftp_clickable_cb( $matches ) { */ function _make_email_clickable_cb( $matches ) { $email = $matches[2] . '@' . $matches[3]; - return $matches[1] . "$email"; + + return $matches[1] . "{$email}"; } /** @@ -2979,7 +2981,6 @@ function _make_email_clickable_cb( $matches ) { * @return string The rel attribute for the anchor or an empty string if no rel attribute should be added. */ function _make_clickable_rel_attr( $url ) { - $rel_parts = array(); $scheme = strtolower( wp_parse_url( $url, PHP_URL_SCHEME ) ); $nofollow_schemes = array_intersect( wp_allowed_protocols(), array( 'https', 'http' ) ); @@ -3009,7 +3010,6 @@ function _make_clickable_rel_attr( $url ) { $rel_attr = $rel ? ' rel="' . esc_attr( $rel ) . '"' : ''; return $rel_attr; - } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 79e1f8d2cb..253bb00da7 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-beta5-55494'; +$wp_version = '6.2-beta5-55495'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.