summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYury German <blueknight@gentoo.org>2017-05-05 17:29:26 -0400
committerYury German <blueknight@gentoo.org>2017-05-05 17:29:26 -0400
commita751233efc6e756083926dfaeaf6eefe718b5f76 (patch)
tree83373c83696d56ab1f0a91615236b2e7b7674477 /plugins/jetpack/modules/shortcodes
parentUpdate wordpress-mobile-pack 2.2.10 (diff)
downloadblogs-gentoo-a751233efc6e756083926dfaeaf6eefe718b5f76.tar.gz
blogs-gentoo-a751233efc6e756083926dfaeaf6eefe718b5f76.tar.bz2
blogs-gentoo-a751233efc6e756083926dfaeaf6eefe718b5f76.zip
Update Aksimet v3.3.1, Jetpack v 4.9, Public Post Preview v 2.6.0
Diffstat (limited to 'plugins/jetpack/modules/shortcodes')
-rw-r--r--plugins/jetpack/modules/shortcodes/soundcloud.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/jetpack/modules/shortcodes/soundcloud.php b/plugins/jetpack/modules/shortcodes/soundcloud.php
index 3b6c69c6..bb986e9f 100644
--- a/plugins/jetpack/modules/shortcodes/soundcloud.php
+++ b/plugins/jetpack/modules/shortcodes/soundcloud.php
@@ -27,7 +27,9 @@ All custom modifs are annoted with "A8C" keyword in comment.
* Register oEmbed provider
*/
+/* A8C: oEmbed is handled now in core; see wp-includes/class-oembed.php
wp_oembed_add_provider( '#https?://(?:api\.)?soundcloud\.com/.*#i', 'http://soundcloud.com/oembed', true );
+*/
/**
@@ -57,14 +59,17 @@ function soundcloud_shortcode( $atts, $content = null ) {
}
$shortcode_options['params'] = $shortcode_params;
+ /* A8C: The original plugin exposes options we don't. SoundCloud omits "visual" shortcode
+ option when false, so if logic here remains, impossible to have non-visual shortcode.
$player_type = soundcloud_get_option( 'player_type', 'visual' );
$isIframe = $player_type !== 'flash';
$isVisual = ! $player_type || $player_type === 'visual' || $shortcode_options['visual'];
+ */
// User preference options
$plugin_options = array_filter(
array(
- 'iframe' => $isIframe,
+ 'iframe' => true, // A8C: See above comment; flash is not a supported option
'width' => soundcloud_get_option( 'player_width' ),
'height' => soundcloud_url_has_tracklist( $shortcode_options['url'] ) ? soundcloud_get_option( 'player_height_multi' ) : soundcloud_get_option( 'player_height' ),
'params' => array_filter(
@@ -72,7 +77,7 @@ function soundcloud_shortcode( $atts, $content = null ) {
'auto_play' => soundcloud_get_option( 'auto_play' ),
'show_comments' => soundcloud_get_option( 'show_comments' ),
'color' => soundcloud_get_option( 'color' ),
- 'visual' => ( $isVisual ? 'true' : 'false' ),
+ 'visual' => 'false', // A8C: Merged with params below at $options assignment
)
),
)