Shortcode: Get rid of custom shortcodes for YouTube and Vimeo in favor of Core #39096
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Significance: patch | ||
| Type: compat | ||
|
|
||
| Embeds: prioritize YouTube and Vimeo embeds provided by WordPress itself, over Jetpack's embedding solution. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -22,16 +22,25 @@ | |||||
| function jetpack_shortcode_get_vimeo_id( $atts ) { | ||||||
| if ( isset( $atts[0] ) ) { | ||||||
| $atts[0] = trim( $atts[0], '=' ); | ||||||
| if ( is_numeric( $atts[0] ) ) { | ||||||
| return (int) $atts[0]; | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Extract Vimeo ID from the URL. For examples: | ||||||
| * https://vimeo.com/12345 | ||||||
| * https://vimeo.com/289091934/cd1f466bcc | ||||||
| * https://vimeo.com/album/2838732/video/6342264 | ||||||
| * https://vimeo.com/groups/758728/videos/897094040 | ||||||
| * https://vimeo.com/channels/staffpicks/123456789 | ||||||
| * https://vimeo.com/album/1234567/video/7654321 | ||||||
| * https://player.vimeo.com/video/18427511 | ||||||
| */ | ||||||
| $pattern = '/(?:https?:\/\/)?vimeo\.com\/(?:groups\/\d+\/videos\/|album\/\d+\/video\/|video\/|channels\/[^\/]+\/videos\/|[^\/]+\/)?([0-9]+)(?:[^\'\"0-9<]|$)/i'; | ||||||
| $match = array(); | ||||||
| if ( preg_match( $pattern, $atts[0], $match ) ) { | ||||||
| return (int) $match[1]; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| return 0; | ||||||
|
|
@@ -250,6 +259,7 @@ class_exists( 'Jetpack_AMP_Support' ) | |||||
| * Callback to modify output of embedded Vimeo video using Jetpack's shortcode. | ||||||
| * | ||||||
| * @since 3.9 | ||||||
| * @deprecated since x.x.x | ||||||
|
There was a problem hiding this comment. On top of that deprecation warning, I think you could add a warning to developers via jetpack/docs/coding-guidelines.md Lines 54 to 55 in f0fa2c8 |
||||||
| * | ||||||
| * @param array $matches Regex partial matches against the URL passed. | ||||||
| * @param array $attr Attributes received in embed response. | ||||||
|
|
@@ -278,21 +288,14 @@ function wpcom_vimeo_embed_url( $matches, $attr, $url ) { | |||||
| * http://player.vimeo.com/video/18427511 | ||||||
| * | ||||||
| * @since 3.9 | ||||||
| * @deprecated since x.x.x | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| * | ||||||
| * @uses wpcom_vimeo_embed_url | ||||||
| */ | ||||||
| function wpcom_vimeo_embed_url_init() { | ||||||
| wp_embed_register_handler( 'wpcom_vimeo_embed_url', '#https?://(?:[^/]+\.)?vimeo\.com/(?:album/(?<album_id>\d+)/)?(?:video/)?(?<video_id>\d+)(?:/.*)?$#i', 'wpcom_vimeo_embed_url' ); | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Transform a Vimeo embed iFrame into a Vimeo shortcode. | ||||||
| * | ||||||
|
|
@@ -374,7 +377,7 @@ function vimeo_link( $content ) { | |||||
| * Could erroneously capture: | ||||||
| * <a href="some.link/maybe/even/vimeo">This video (vimeo.com/12345) is teh cat's meow!</a> | ||||||
| */ | ||||||
| $plain_url = "(?:[^'\">]?\/?(?:https?:\/\/)?vimeo\.com\/(?:groups\/\d+\/videos\/|album\/\d+\/video\/|video\/|channels\/[^\/]+\/videos\/|[^\/]+\/)?)([0-9]+)(?:[^'\"0-9<]|$)"; | ||||||
|
|
||||||
| return jetpack_preg_replace_callback_outside_tags( | ||||||
| sprintf( '#%s|%s#i', $shortcode, $plain_url ), | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -175,7 +175,7 @@ public function get_vimeo_urls() { | |
| * @param string $url The URL to test. | ||
| * @param string $video_id The expected video ID. | ||
| */ | ||
| public function test_shortcodes_vimeo_replace_url_with_iframe_in_the_content( $url, $video_id ) { | ||
| if ( | ||
| ( defined( 'IS_WPCOM' ) && IS_WPCOM ) | ||
| || ( defined( 'IS_ATOMIC' ) && IS_ATOMIC ) | ||
|
|
@@ -186,7 +186,7 @@ public function test_replace_url_with_iframe_in_the_content( $url, $video_id ) { | |
|
|
||
| global $post; | ||
|
|
||
| $post = self::factory()->post->create_and_get( array( 'post_content' => "[vimeo $url]" ) ); | ||
|
There was a problem hiding this comment. Since the content goes from just a URL to a shortcode with a URL, should the function name be updated accordingly? There was a problem hiding this comment. Renamed to |
||
|
|
||
| do_action( 'init' ); | ||
| setup_postdata( $post ); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -97,14 +97,13 @@ public function get_youtube_id_options() { | |
| * @covers ::youtube_shortcode | ||
| * @since 3.9 | ||
| */ | ||
| public function test_shortcodes_youtube_replace_url_with_iframe_in_the_content() { | ||
| global $post; | ||
|
|
||
| $youtube_id = 'JaNH56Vpg-A'; | ||
| $url = 'http://www.youtube.com/watch?v=' . $youtube_id; | ||
| $post = self::factory()->post->create_and_get( array( 'post_content' => "[youtube $url]" ) ); | ||
|
|
||
| setup_postdata( $post ); | ||
| ob_start(); | ||
| // This below is needed since Core inserts "loading=lazy" right after the iframe opener. | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can use the
$$next-version$$placeholder; it will be automatically replaced on release.jetpack/projects/packages/README.md
Lines 116 to 123 in d3f5823