From 50cec5733cc3d92fd784fdaf24bbac47045b52c0 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 17 May 2019 12:13:03 +0000
Subject: [PATCH] Formatting: Adjust `wp_targeted_link_rel()` to ensure JSON
 format is preserved and correct quotes are used when adding the missing `rel`
 attribute.

Props birgire, TobiasBg, fierevere, audrasjb, SergeyBiryukov.
Merges [45348] to the 5.2 branch.
Fixes #46316, #47244.
Built from https://develop.svn.wordpress.org/branches/5.2@45349


git-svn-id: http://core.svn.wordpress.org/branches/5.2@45160 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/formatting.php | 4 ++++
 wp-includes/version.php    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 00830c68f5..b442b0b151 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -3094,6 +3094,10 @@ function wp_targeted_link_rel_callback( $matches ) {
 		$delimiter = trim( $rel_match[1] ) ? $rel_match[1] : '"';
 		$rel       = 'rel=' . $delimiter . trim( implode( ' ', $parts ) ) . $delimiter;
 		$link_html = str_replace( $rel_match[0], $rel, $link_html );
+	} elseif ( preg_match( '|target\s*=\s*?\\\\"|', $link_html ) ) {
+		$link_html .= " rel=\\\"$rel\\\"";
+	} elseif ( preg_match( '#(target|href)\s*=\s*?\'#', $link_html ) ) {
+		$link_html .= " rel='$rel'";
 	} else {
 		$link_html .= " rel=\"$rel\"";
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 295e6df7e3..ce10a990d0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2.1-alpha-45347';
+$wp_version = '5.2.1-alpha-45349';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.