Changeset 34277 for trunk

Timestamp:

09/18/2015 04:35:37 AM (11 years ago)

Author:

wonderboymusic

Message:

Comments: in wp_rel_nofollow_callback(), account for the fact that a link might already have a rel attribute. Currently, if a link already has a rel, it will result it duplicate attributes on the element with conflicting values.

Adds unit tests.

Props junsuijin, wonderboymusic.
Fixes #9959.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -2260 +2260 @@
 function wp_rel_nofollow_callback( $matches ) {
         $text = $matches[1];
-        $text = str_replace(array(' rel="nofollow"', " rel='nofollow'"), '', $text);
-        return "<a $text rel=\"nofollow\">";
+        $atts = shortcode_parse_atts( $matches[1] );
+        $rel = 'nofollow';
+        if ( ! empty( $atts['rel'] ) ) {
+                $parts = array_map( 'trim', explode( ' ', $atts['rel'] ) );
+                if ( false === array_search( 'nofollow', $parts ) ) {
+                        $parts[] = 'nofollow';
+                }
+                $rel = implode( ' ', $parts );
+                unset( $atts['rel'] );
+
+                $html = '';
+                foreach ( $atts as $name => $value ) {
+                        $html .= "{$name}=\"$value\" ";
+                }
+                $text = trim( $html );
+        }
+        return "<a $text rel=\"$rel\">";
 }