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

Formatting: Improve `rel="nofollow"` handling in comments. 

Merges [44833] to the 5.1 branch.
Built from https://develop.svn.wordpress.org/branches/5.1@44834


git-svn-id: http://core.svn.wordpress.org/branches/5.1@44666 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-03-12 22:16:49 +00:00
parent 08cb9e2f0c
commit b9e24e33a8
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/formatting.php
View File

@ -3004,10 +3004,12 @@ function wp_rel_nofollow_callback( $matches ) {
$atts = shortcode_parse_atts( $matches[1] ); $atts = shortcode_parse_atts( $matches[1] );
$rel = 'nofollow'; $rel = 'nofollow';
if ( preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'http' ) ) . ')%i', $text ) || if ( ! empty( $atts['href'] ) ) {
preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text ) ) { if ( in_array( strtolower( wp_parse_url( $atts['href'], 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 ) ) ) {
return "<a $text>"; return "<a $text>";
}
}
} }
if ( ! empty( $atts['rel'] ) ) { if ( ! empty( $atts['rel'] ) ) {
@ -3020,11 +3022,11 @@ function wp_rel_nofollow_callback( $matches ) {
$html = ''; $html = '';
foreach ( $atts as $name => $value ) { foreach ( $atts as $name => $value ) {
$html .= "{$name}=\"$value\" "; $html .= "{$name}=\"" . esc_attr( $value ) . "\" ";
} }
$text = trim( $html ); $text = trim( $html );
} }
return "<a $text rel=\"$rel\">"; return "<a $text rel=\"" . esc_attr( $rel ) . "\">";
} }
/** /**

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.1.1-RC1-44831'; $wp_version = '5.1.1-RC1-44834';
/** /**
* 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.