Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Formatting: Restore consistent quotes in _make_web_ftp_clickable_cb().

Browse Source 
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.
Built from https://develop.svn.wordpress.org/trunk@55495


git-svn-id: http://core.svn.wordpress.org/trunk@55028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2023-03-09 00:20:18 +00:00
parent 11d4f1b3bf
commit 8743a96dfe
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/comment-template.php
View File

@ -239,16 +239,15 @@ function get_comment_author_link( $comment_id = 0 ) {
* *
* @since 6.2.0 * @since 6.2.0
* *
* @param string[] $rel_parts An array of strings representing the rel * @param string[] $rel_parts An array of strings representing the rel tags
* tags which will be joined into the anchor's * which will be joined into the anchor's rel attribute.
* rel attribute. * @param WP_Comment $comment The comment object.
* @param WP_Comment $comment The comment object
*/ */
$rel_parts = apply_filters( 'comment_author_link_rel', $rel_parts, $comment ); $rel_parts = apply_filters( 'comment_author_link_rel', $rel_parts, $comment );
$rel = implode( ' ', $rel_parts ); $rel = implode( ' ', $rel_parts );
$rel = esc_attr( $rel ); $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 ) : ''; $rel = ! empty( $rel ) ? sprintf( ' rel="%s"', $rel ) : '';
$return = sprintf( $return = sprintf(

10
wp-includes/formatting.php
View File

@ -2918,8 +2918,8 @@ function _make_url_clickable_cb( $matches ) {
} }
$rel_attr = _make_clickable_rel_attr( $url ); $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;
} }
/** /**
@ -2951,7 +2951,8 @@ function _make_web_ftp_clickable_cb( $matches ) {
} }
$rel_attr = _make_clickable_rel_attr( $dest ); $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}";
} }
/** /**
@ -2967,7 +2968,8 @@ function _make_web_ftp_clickable_cb( $matches ) {
*/ */
function _make_email_clickable_cb( $matches ) { function _make_email_clickable_cb( $matches ) {
$email = $matches[2] . '@' . $matches[3]; $email = $matches[2] . '@' . $matches[3];
return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
return $matches[1] . "<a href=\"mailto:{$email}\">{$email}</a>";
} }
/** /**
@ -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. * @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 ) { function _make_clickable_rel_attr( $url ) {
$rel_parts = array(); $rel_parts = array();
$scheme = strtolower( wp_parse_url( $url, PHP_URL_SCHEME ) ); $scheme = strtolower( wp_parse_url( $url, PHP_URL_SCHEME ) );
$nofollow_schemes = array_intersect( wp_allowed_protocols(), array( 'https', 'http' ) ); $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 ) . '"' : ''; $rel_attr = $rel ? ' rel="' . esc_attr( $rel ) . '"' : '';
return $rel_attr; return $rel_attr;
} }
/** /**

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.