<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[44714] trunk: Customize: Remove `wp_targeted_link_rel` pre-save filter from change-sets.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/44714">44714</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44714","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-01-29 21:28:57 +0000 (Tue, 29 Jan 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customize: Remove `wp_targeted_link_rel` pre-save filter from change-sets.
The pre-save filters added to links in <a href="https://core.trac.wordpress.org/changeset/43732">[43732]</a> could invalidate JSON data when saving Customizer change-sets.
This removes the filters when saving and publishing change-sets.
Props peterwilsoncc, nikeo for testing.
See <a href="https://core.trac.wordpress.org/ticket/45292">#45292</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunktestsphpunittestsformattingWPTargetedLinkRelphp">trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2019-01-29 20:18:33 UTC (rev 44713)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2019-01-29 21:28:57 UTC (rev 44714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2885,11 +2885,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->store_changeset_revision = $allow_revision;
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ), 5, 3 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Update the changeset post. The publish_customize_changeset action will cause the settings in the changeset to be saved via WP_Customize_Setting::save().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Update the changeset post. The publish_customize_changeset action
+ * will cause the settings in the changeset to be saved via
+ * WP_Customize_Setting::save().
+ */
+
+ // Prevent content filters from corrupting JSON in post_content.
</ins><span class="cx" style="display: block; padding: 0 10px"> $has_kses = ( false !== has_filter( 'content_save_pre', 'wp_filter_post_kses' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $has_kses ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- kses_remove_filters(); // Prevent KSES from corrupting JSON in post_content.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ kses_remove_filters();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_targeted_link_rel_filters = ( false !== has_filter( 'content_save_pre', 'wp_targeted_link_rel' ) );
+ if ( $has_targeted_link_rel_filters ) {
+ wp_remove_targeted_link_rel_filters();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Note that updating a post with publish status will trigger WP_Customize_Manager::publish_changeset_values().
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $changeset_post_id ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2918,9 +2928,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_changeset_post_id = $r; // Update cached post ID for the loaded changeset.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Restore removed content filters.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $has_kses ) {
</span><span class="cx" style="display: block; padding: 0 10px"> kses_init_filters();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $has_targeted_link_rel_filters ) {
+ wp_init_targeted_link_rel_filters();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_changeset_data = null; // Reset so WP_Customize_Manager::changeset_data() will re-populate with updated contents.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ) );
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2019-01-29 20:18:33 UTC (rev 44713)
+++ trunk/src/wp-includes/default-filters.php 2019-01-29 21:28:57 UTC (rev 44714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,19 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add proper rel values for links with target.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-foreach ( array(
- 'title_save_pre',
- 'content_save_pre',
- 'excerpt_save_pre',
- 'content_filtered_save_pre',
- 'pre_comment_content',
- 'pre_term_description',
- 'pre_link_description',
- 'pre_link_notes',
- 'pre_user_description',
-) as $filter ) {
- add_filter( $filter, 'wp_targeted_link_rel' );
-};
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'init', 'wp_init_targeted_link_rel_filters' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Format strings for display.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title' ) as $filter ) {
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2019-01-29 20:18:33 UTC (rev 44713)
+++ trunk/src/wp-includes/formatting.php 2019-01-29 21:28:57 UTC (rev 44714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3096,6 +3096,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Adds all filters modifying the rel attribute of targeted links.
+ *
+ * @since 5.1.0
+ */
+function wp_init_targeted_link_rel_filters() {
+ $filters = array(
+ 'title_save_pre',
+ 'content_save_pre',
+ 'excerpt_save_pre',
+ 'content_filtered_save_pre',
+ 'pre_comment_content',
+ 'pre_term_description',
+ 'pre_link_description',
+ 'pre_link_notes',
+ 'pre_user_description',
+ );
+
+ foreach ( $filters as $filter ) {
+ add_filter( $filter, 'wp_targeted_link_rel' );
+ };
+}
+
+/**
+ * Removes all filters modifying the rel attribute of targeted links.
+ *
+ * @since 5.1.0
+ */
+function wp_remove_targeted_link_rel_filters() {
+ $filters = array(
+ 'title_save_pre',
+ 'content_save_pre',
+ 'excerpt_save_pre',
+ 'content_filtered_save_pre',
+ 'pre_comment_content',
+ 'pre_term_description',
+ 'pre_link_description',
+ 'pre_link_notes',
+ 'pre_user_description',
+ );
+
+ foreach ( $filters as $filter ) {
+ remove_filter( $filter, 'wp_targeted_link_rel' );
+ };
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Convert one smiley code to the icon graphic file equivalent.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Callback handler for convert_smilies().
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPTargetedLinkRelphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php 2019-01-29 20:18:33 UTC (rev 44713)
+++ trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php 2019-01-29 21:28:57 UTC (rev 44714)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,4 +83,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = '<p>Links: <a href="/" target="_blank">Do not change me</a></p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Ensure default content filters are added.
+ *
+ * @ticket 45292.
+ */
+ public function test_wp_targeted_link_rel_filters_run() {
+ $content = '<p>Links: <a href="/" target="_blank">No rel</a></p>';
+ $expected = '<p>Links: <a href="/" target="_blank" rel="noopener noreferrer">No rel</a></p>';
+
+ $post = $this->factory()->post->create_and_get(
+ array(
+ 'post_content' => $content,
+ )
+ );
+
+ $this->assertEquals( $expected, $post->post_content );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>