Ticket #31645: 31645.5.patch

src/wp-admin/includes/class-wp-press-this.php

@@ -561 +561 @@
                         foreach ( $items as $value ) {
                                 if ( preg_match( '/rel=["\'](canonical|shortlink|icon)["\']/i', $value, $matches_rel ) && preg_match( '/href=[\'"]([^\'" ]+)[\'"]/i', $value, $matches_url ) ) {
                                         $rel = $matches_rel[1];
-                                        $url = $this->_limit_url( $matches_url[1] );
+                                        $url = $matches_url[1];
 
+                                        if ( $rel === 'canonical' && ! preg_match( '%^(?:https?:)?//%i', $url ) ) {
+                                                continue;
+                                        }
+
+                                        $url = $this->_limit_url( $url );
+
                                         if ( ! empty( $url ) && empty( $data['_links'][ $rel ] ) ) {
                                                 $data['_links'][ $rel ] = $url;
                                         }
@@ -663 +669 @@
                                                                 $data = $this->_process_meta_entry( $key, $value, $data );
                                                         }
                                                 } else {
+                                                        if ( $key === 'canonical' && ! preg_match( '%^(?:https?:)?//%i', $value ) ) {
+                                                                continue;
+                                                        }
+
                                                         if ( in_array( $key, array( 'canonical', 'shortlink', 'icon' ), true ) ) {
                                                                 $data[ $type ][ $key ] = $this->_limit_url( wp_unslash( $value ) );
                                                         }