Changeset 55495 for trunk/src/wp-includes/formatting.php

Timestamp:

03/09/2023 12:18:29 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Formatting: Restore consistent quotes in _make_web_ftp_clickable_cb().

After the introduction of _make_clickable_rel_attr() in an earlier commit, the function ended up returning link markup with a mix of single and double quotes.

This commit ensures that _make_web_ftp_clickable_cb() always returns double quotes, restoring consistency with other similar callback functions used by make_clickable():

• _make_url_clickable_cb()
• _make_email_clickable_cb()

Follow-up to [55289].

See #53290, #56444.

File:

• trunk/src/wp-includes/formatting.php (modified) (5 diffs)

trunk/src/wp-includes/formatting.php

@@ -2919 +2919 @@
 
     $rel_attr = _make_clickable_rel_attr( $url );
-    return $matches[1] . "<a href=\"$url\"$rel_attr>$url</a>" . $suffix;
-
+
+    return $matches[1] . "<a href=\"{$url}\"{$rel_attr}>{$url}</a>" . $suffix;
 }
 
@@ -2952 +2952 @@
 
     $rel_attr = _make_clickable_rel_attr( $dest );
-    return $matches[1] . "<a href='{$dest}'{$rel_attr}>{$dest}</a>{$ret}";
+
+    return $matches[1] . "<a href=\"{$dest}\"{$rel_attr}>{$dest}</a>{$ret}";
 }
 
@@ -2968 +2969 @@
 function _make_email_clickable_cb( $matches ) {
     $email = $matches[2] . '@' . $matches[3];
-    return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+
+    return $matches[1] . "<a href=\"mailto:{$email}\">{$email}</a>";
 }
 
@@ -2980 +2982 @@
  */
 function _make_clickable_rel_attr( $url ) {
-
     $rel_parts        = array();
     $scheme           = strtolower( wp_parse_url( $url, PHP_URL_SCHEME ) );
@@ -3010 +3011 @@
 
     return $rel_attr;
-
 }