Context Navigation

← Previous Change
Next Change →

formatting.php

Timestamp:

09/04/2019 05:47:09 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Improve handling the existing rel attribute in wp_rel_nofollow_callback().

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

Location:

branches/4.9

Files:

: 2 edited

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

Legend:

: Unmodified
: Added
: Removed

branches/4.9
- Property svn:mergeinfo changed
  /trunk merged: 45990

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

-              r44836
+              r45994
 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'] ) ) {
                 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 ) ) ) {
+                if ( in_array( strtolower( wp_parse_url( $atts['href']['value'], PHP_URL_SCHEME ) ), array( 'http', 'https' ), true ) ) {
+                        if ( strtolower( wp_parse_url( $atts['href']['value'], PHP_URL_HOST ) ) === strtolower( wp_parse_url( home_url(), PHP_URL_HOST ) ) ) {
                                 return "<a $text>";
+                        }
 …
         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';
 …
                 $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 );

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core

Context Navigation

Changeset 45994 for branches/4.9/src/wp-includes/formatting.php

Legend:

branches/4.9

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

Download in other formats: