Ticket #46986: 46986.3.diff

src/wp-includes/class-wp-oembed.php

@@ -520 +520 @@
                 $provider = add_query_arg( 'maxwidth', (int) $args['width'], $provider );
                 $provider = add_query_arg( 'maxheight', (int) $args['height'], $provider );
                 $provider = add_query_arg( 'url', urlencode( $url ), $provider );
-                $provider = add_query_arg( 'dnt', 1, $provider );
+                if ( strpos( $provider, 'vimeo.com' ) === false ) {
+                        $provider = add_query_arg( 'dnt', 1, $provider );
+                }
 
                 /**
                  * Filters the oEmbed URL to be fetched.
@@ -527 +529 @@
                  *
                  * @since 2.9.0
                  * @since 4.9.0 The `dnt` (Do Not Track) query parameter was added to all oEmbed provider URLs.
+                 * @since 5.6.0 The `dnt` (Do Not Track) query parameter was removed from Vimeo oEmbed URLs. (@ticket: #46986)
                  *
+                 * The `dnt` parameter can be re-enabled on Vimeo oEmbed URLs using the following:
+                 *
+                 *     function enable_dnt_vimeo_oembed( $provider, $url, $args ) {
+                 *         if ( strpos( $provider, 'vimeo.com' ) !== false ) {
+                 *             $provider = add_query_arg( 'dnt', 1, $provider );
+                 *         }
+                 *         return $provider;
+                 *     }
+                 *     add_filter( 'oembed_fetch_url', 'enable_dnt_vimeo_oembed', 10, 3 );
+                 *
                  * @param string $provider URL of the oEmbed provider.
                  * @param string $url      URL of the content to be embedded.
                  * @param array  $args     Optional arguments, usually passed from a shortcode.

tests/phpunit/tests/oembed/wpOembed.php

@@ -28 +28 @@
                 return $result ? $result : false;
         }
 
+        /*
+         * @see test_add_dnt_vimeo_oembed_fetch_url()
+         */
+        public function _filter_add_dnt_vimeo( $provider ) {
+                if ( strpos( $provider, 'vimeo.com' ) !== false ) {
+                        $provider = add_query_arg( 'dnt', 1, $provider );
+                }
+                return $provider;
+        }
+
         public function test_wp_filter_pre_oembed_result_prevents_http_request_for_internal_permalinks() {
                 $post_id   = self::factory()->post->create();
                 $permalink = get_permalink( $post_id );
@@ -234 +244 @@
                 $this->assertFalse( $actual );
                 $this->assertSame( $current_blog_id, get_current_blog_id() );
         }
+
+        /**
+         * @ticket 46986
+         */
+        public function test_vimeo_oembed_does_not_have_dnt() {
+                $vimeo_oembed = $this->oembed->get_data( 'https://vimeo.com/202791609' );
+
+                $this->assertNotContains( 'dnt=1', $vimeo_oembed->html );
+        }
+
+        /**
+         * @ticket 46986
+         */
+        public function test_add_dnt_vimeo_oembed_fetch_url() {
+                add_filter( 'oembed_fetch_url', array( $this, '_filter_add_dnt_vimeo' ) );
+                $vimeo_oembed = $this->oembed->get_data( 'https://vimeo.com/202791609' );
+                remove_filter( 'oembed_fetch_url', array( $this, '_filter_add_dnt_vimeo' ) );
+
+                $this->assertContains( 'dnt=1', $vimeo_oembed->html );
+        }
 }