Changeset 44714

Timestamp:

01/29/2019 09:28:57 PM (6 years ago)

Author:

peterwilsoncc

Message:

Customize: Remove wp_targeted_link_rel pre-save filter from change-sets.

The pre-save filters added to links in [43732] 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 #45292.

Location:

trunk

Files:

• src/wp-includes/class-wp-customize-manager.php (modified) (2 diffs)
• src/wp-includes/default-filters.php (modified) (1 diff)
• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/WPTargetedLinkRel.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -2886 +2886 @@
         add_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ), 5, 3 );
 
-        // Update the changeset post. The publish_customize_changeset action will cause the settings in the changeset to be saved via WP_Customize_Setting::save().
+        /*
+         * 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.
         $has_kses = ( false !== has_filter( 'content_save_pre', 'wp_filter_post_kses' ) );
         if ( $has_kses ) {
-            kses_remove_filters(); // Prevent KSES from corrupting JSON in post_content.
+            kses_remove_filters();
+        }
+        $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();
         }
 
@@ -2919 +2929 @@
             }
         }
+
+        // Restore removed content filters.
         if ( $has_kses ) {
             kses_init_filters();
         }
+        if ( $has_targeted_link_rel_filters ) {
+            wp_init_targeted_link_rel_filters();
+        }
+
         $this->_changeset_data = null; // Reset so WP_Customize_Manager::changeset_data() will re-populate with updated contents.
 

trunk/src/wp-includes/default-filters.php

@@ -129 +129 @@
 
 // Add proper rel values for links with target.
-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' );
-};
+add_action( 'init', 'wp_init_targeted_link_rel_filters' );
 
 // Format strings for display.

trunk/src/wp-includes/formatting.php

@@ -3097 +3097 @@
 
 /**
+ * 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' );
+    };
+}
+
+/**
  * Convert one smiley code to the icon graphic file equivalent.
  *

trunk/tests/phpunit/tests/formatting/WPTargetedLinkRel.php

@@ -84 +84 @@
         $this->assertEquals( $expected, wp_targeted_link_rel( $content ) );
     }
+
+    /**
+     * 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 );
+    }
 }