Changeset 44837 for branches/4.8

Timestamp:

03/12/2019 10:20:10 PM (7 years ago)

Author:

SergeyBiryukov

Message:

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

Merges [44833] to the 4.8 branch.

Location:

branches/4.8

Files:

• . (modified) (1 prop)
• src/wp-includes/formatting.php (modified) (2 diffs)

branches/4.8/src/wp-includes/formatting.php

@@ -2735 +2735 @@
         $rel  = 'nofollow';
 
-        if ( preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'http' ) ) . ')%i', $text ) ||
-             preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text )
-        ) {
-                return "<a $text>";
+        if ( ! empty( $atts['href'] ) ) {
+                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>";
+                        }
+                }
         }
 
@@ -2751 +2753 @@
                 $html = '';
                 foreach ( $atts as $name => $value ) {
-                        $html .= "{$name}=\"$value\" ";
+                        $html .= "{$name}=\"" . esc_attr( $value ) . "\" ";
                 }
                 $text = trim( $html );
         }
-        return "<a $text rel=\"$rel\">";
+        return "<a $text rel=\"" . esc_attr( $rel ) . "\">";
 }