Changeset 45999 for branches/4.5

Timestamp:

09/04/2019 05:53:08 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Improve handling the existing rel attribute in wp_rel_nofollow_callback().

Merges [45990] to the 4.5 branch.
Props xknown, sstoqnov.

Location:

branches/4.5

Files:

• . (modified) (1 prop)
• src/wp-includes/formatting.php (modified) (3 diffs)
• tests/phpunit/tests/formatting/WPRelNoFollow.php (modified) (1 diff)

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

@@ -2348 +2348 @@
 function wp_rel_nofollow_callback( $matches ) {
     $text = $matches[1];
-    $atts = shortcode_parse_atts( $matches[1] );
+    $atts = wp_kses_hair( $matches[1], wp_allowed_protocols() );
     $rel  = 'nofollow';
 
     if ( ! empty( $atts['href'] ) ) {
-        $href_parts  = wp_parse_url( $atts['href'] );
+        $href_parts  = wp_parse_url( $atts['href']['value'] );
         $href_scheme = isset( $href_parts['scheme'] ) ? $href_parts['scheme'] : '';
         $href_host   = isset( $href_parts['host'] ) ? $href_parts['host'] : '';
@@ -2365 +2365 @@
 
     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 ) ) {
             $parts[] = 'nofollow';
@@ -2374 +2374 @@
         $html = '';
         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 );

branches/4.5/tests/phpunit/tests/formatting/WPRelNoFollow.php

@@ -75 +75 @@
         );
     }
+
+    public function test_append_no_follow_with_valueless_attribute() {
+        $content = '<p>This is some cool <a href="demo.com" download rel="hola">Code</a></p>';
+        $expected = '<p>This is some cool <a href=\"demo.com\" download rel=\"hola nofollow\">Code</a></p>';
+        $this->assertEquals( $expected, wp_rel_nofollow( $content ) );
+    }
 }