diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php
index 77819cb49b..a739f622b8 100644
--- a/src/wp-includes/comment-template.php
+++ b/src/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/src/wp-includes/formatting.php b/src/wp-includes/formatting.php
index 7f27a02a44..1db0003be9 100644
--- a/src/wp-includes/formatting.php
+++ b/src/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/tests/phpunit/tests/formatting/makeClickable.php b/tests/phpunit/tests/formatting/makeClickable.php
index 9a6c0cf911..0c6236c859 100644
--- a/tests/phpunit/tests/formatting/makeClickable.php
+++ b/tests/phpunit/tests/formatting/makeClickable.php
@@ -108,12 +108,12 @@ class Tests_Formatting_MakeClickable extends WP_UnitTestCase {
'There was a spoon named www.wordpress.org) said Alice.',
);
$urls_expected = array(
- "http://www.wordpress.org",
- "There was a spoon named http://www.wordpress.org. Alice!",
- "There was a spoon named http://www.wordpress.org, said Alice.",
- "There was a spoon named http://www.wordpress.org; said Alice.",
- "There was a spoon named http://www.wordpress.org: said Alice.",
- "There was a spoon named http://www.wordpress.org) said Alice.",
+ 'http://www.wordpress.org',
+ 'There was a spoon named http://www.wordpress.org. Alice!',
+ 'There was a spoon named http://www.wordpress.org, said Alice.',
+ 'There was a spoon named http://www.wordpress.org; said Alice.',
+ 'There was a spoon named http://www.wordpress.org: said Alice.',
+ 'There was a spoon named http://www.wordpress.org) said Alice.',
);
foreach ( $urls_before as $key => $url ) {
@@ -135,12 +135,12 @@ class Tests_Formatting_MakeClickable extends WP_UnitTestCase {
'There was a spoon named www.wordpress.org)',
);
$urls_expected = array(
- "http://www.wordpress.org",
- "There was a spoon named http://www.wordpress.org.",
- "There was a spoon named http://www.wordpress.org,",
- "There was a spoon named http://www.wordpress.org;",
- "There was a spoon named http://www.wordpress.org:",
- "There was a spoon named http://www.wordpress.org)",
+ 'http://www.wordpress.org',
+ 'There was a spoon named http://www.wordpress.org.',
+ 'There was a spoon named http://www.wordpress.org,',
+ 'There was a spoon named http://www.wordpress.org;',
+ 'There was a spoon named http://www.wordpress.org:',
+ 'There was a spoon named http://www.wordpress.org)',
);
foreach ( $urls_before as $key => $url ) {
@@ -439,7 +439,6 @@ class Tests_Formatting_MakeClickable extends WP_UnitTestCase {
}
public function data_add_rel_ugc_in_comments() {
-
$home_url_http = set_url_scheme( home_url(), 'http' );
$home_url_https = set_url_scheme( home_url(), 'https' );
@@ -451,12 +450,12 @@ class Tests_Formatting_MakeClickable extends WP_UnitTestCase {
),
array(
'www.wordpress.org',
- 'http://www.wordpress.org',
+ '
http://www.wordpress.org',
),
// @ticket 56444
array(
'www.example.org',
- '
http://www.example.org',
+ '
http://www.example.org',
),
array(
$home_url_http,