WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve handling the existing `rel` attribute in `wp_rel_nofollow_callback()`. 

Merges [45990] to the 5.2 branch.
Props xknown, sstoqnov.
Built from https://develop.svn.wordpress.org/branches/5.2@45991


git-svn-id: http://core.svn.wordpress.org/branches/5.2@45802 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-09-04 17:39:51 +00:00
parent affedce0a8
commit 50f2f05956
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/formatting.php
View File

@ -3001,19 +3001,19 @@ function wp_rel_nofollow( $text ) {
*/ */
function wp_rel_nofollow_callback( $matches ) { function wp_rel_nofollow_callback( $matches ) {
$text = $matches[1]; $text = $matches[1];
$atts = shortcode_parse_atts( $matches[1] ); $atts = wp_kses_hair( $matches[1], wp_allowed_protocols() );
$rel = 'nofollow'; $rel = 'nofollow';
if ( ! empty( $atts['href'] ) ) { if ( ! empty( $atts['href'] ) ) {
if ( in_array( strtolower( wp_parse_url( $atts['href'], PHP_URL_SCHEME ) ), array( 'http', 'https' ), true ) ) { if ( in_array( strtolower( wp_parse_url( $atts['href']['value'], PHP_URL_SCHEME ) ), array( 'http', 'https' ), true ) ) {
if ( strtolower( wp_parse_url( $atts['href'], PHP_URL_HOST ) ) === strtolower( wp_parse_url( home_url(), PHP_URL_HOST ) ) ) { if ( strtolower( wp_parse_url( $atts['href']['value'], PHP_URL_HOST ) ) === strtolower( wp_parse_url( home_url(), PHP_URL_HOST ) ) ) {
return "<a $text>"; return "<a $text>";
} }
} }
} }
if ( ! empty( $atts['rel'] ) ) { if ( ! empty( $atts['rel'] ) ) {
$parts = array_map( 'trim', explode( ' ', $atts['rel'] ) ); $parts = array_map( 'trim', explode( ' ', $atts['rel']['value'] ) );
if ( false === array_search( 'nofollow', $parts ) ) { if ( false === array_search( 'nofollow', $parts ) ) {
$parts[] = 'nofollow'; $parts[] = 'nofollow';
} }
@ -3022,7 +3022,11 @@ function wp_rel_nofollow_callback( $matches ) {
$html = ''; $html = '';
foreach ( $atts as $name => $value ) { foreach ( $atts as $name => $value ) {
$html .= "{$name}=\"" . esc_attr( $value ) . '" '; if ( isset( $value['vless'] ) && 'y' === $value['vless'] ) {
$html .= $name . ' ';
} else {
$html .= "{$name}=\"" . esc_attr( $value['value'] ) . '" ';
}
} }
$text = trim( $html ); $text = trim( $html );
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.2.3-RC1-45989'; $wp_version = '5.2.3-RC1-45991';
/** /**
* 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.