Skip to content

Shortcode: Update Mixcloud oEmbed url and fix up typos #28061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeherve merged 3 commits into from
Dec 22, 2022
Merged

Shortcode: Update Mixcloud oEmbed url and fix up typos #28061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c3551a
Shortcode: Update Mixcloud oEmbed url and fix up typos
matclayton Dec 22, 2022
e0bfdbd
Add Changelog for Mixcloud shortcode updates
matclayton Dec 22, 2022
0e6954b
Fix changelog entry.
dereksmart Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/update-mixcloud-embed-shortcode
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: bugfix

Update the Mixcloud oEmbed API Endpoint to the new version
10 changes: 5 additions & 5 deletions projects/plugins/jetpack/modules/shortcodes/mixcloud.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

/*
* Register oEmbed provider
* Example URL: http://www.mixcloud.com/oembed/?url=http://www.mixcloud.com/MalibuRum/play-6-kissy-sellouts-winter-sun-house-party-mix/
* Example URL: http://app.mixcloud.com/oembed/?url=http://www.mixcloud.com/MalibuRum/play-6-kissy-sellouts-winter-sun-house-party-mix/
*/
wp_oembed_add_provider( '#https?://(?:www\.)?mixcloud\.com/\S*#i', 'https://www.mixcloud.com/oembed', true );
wp_oembed_add_provider( '#https?://(?:www\.)?mixcloud\.com/\S*#i', 'https://app.mixcloud.com/oembed/', true );

/**
* Register mixcloud shortcode.
Expand Down Expand Up @@ -71,7 +71,7 @@ function mixcloud_shortcode( $atts, $content = null ) {
$query_args = array( 'url' => $mixcloud_url );
$query_args = array_merge( $query_args, $atts );

$url = add_query_arg( urlencode_deep( $query_args ), 'https://www.mixcloud.com/oembed/' );
$url = add_query_arg( urlencode_deep( $query_args ), 'https://app.mixcloud.com/oembed/' );
$mixcloud_response = wp_remote_get( $url, array( 'redirection' => 0 ) );
if ( is_wp_error( $mixcloud_response ) || 200 !== $mixcloud_response['response']['code'] || empty( $mixcloud_response['body'] ) ) {
return '<!-- mixcloud error: invalid mixcloud resource -->';
Expand All @@ -83,9 +83,9 @@ function mixcloud_shortcode( $atts, $content = null ) {

preg_match( '/sandbox="([^"]*)"/', $html, $matches );

if ( empty( $matches ) ) { // MixCloud doesn't use sandbox attribute.
if ( empty( $matches ) ) { // Mixcloud doesn't use sandbox attribute.
$html = preg_replace( '/>/', ' sandbox="allow-popups allow-scripts allow-same-origin allow-presentation">', $html, 1 );
} else { // MixCloud uses sandbox attribute.
} else { // Mixcloud uses sandbox attribute.

$allowed_values = array();
// Here we make sure that these string are not repeated in the sandbox attribute.
Expand Down