diff --git a/modules/EmbedPlayer/resources/mw.processEmbedPlayers.js b/modules/EmbedPlayer/resources/mw.processEmbedPlayers.js index 775bbc1154..3b18952043 100644 --- a/modules/EmbedPlayer/resources/mw.processEmbedPlayers.js +++ b/modules/EmbedPlayer/resources/mw.processEmbedPlayers.js @@ -89,7 +89,13 @@ mw.processEmbedPlayers = function( playerSelect, callback ) { // Allow plugins to add bindings to the inDomPlayer $( mw ).trigger ( 'EmbedPlayerNewPlayer', inDomPlayer ); - + + // Also trigger legacy newEmbedPlayerEvent event + if( $( mw ).data('events') && $( mw ).data('events')['newEmbedPlayerEvent'] ){ + mw.log("processEmbedPlayers:: Warning, newEmbedPlayerEvent is deprecated, please use EmbedPlayerNewPlayer"); + $( mw ).trigger( 'newEmbedPlayerEvent', inDomPlayer ); + } + // Add a player ready binding: $( inDomPlayer ).bind( 'playerReady', areSelectedPlayersReady ); diff --git a/modules/KalturaSupport/KalturaPlaylistResult.php b/modules/KalturaSupport/KalturaPlaylistResult.php index a009a4531a..b8c9e00870 100644 --- a/modules/KalturaSupport/KalturaPlaylistResult.php +++ b/modules/KalturaSupport/KalturaPlaylistResult.php @@ -153,9 +153,9 @@ function getFirstPlaylistId(){ if( is_array( $plParsed ) && isset( $plParsed['query'] ) ){ $args = explode("&", $plParsed['query'] ); foreach( $args as $inx => $argSet ){ - list( $key, $val ) = explode('=', $argSet ); - if( $key == 'playlist_id' ){ - $playlistId = $val; + $argParts = explode('=', $argSet ); + if( $argParts[0] == 'playlist_id' && isset( $argParts[1] )){ + $playlistId = $argParts[1]; } } } diff --git a/modules/KalturaSupport/tests/AccessControlPlaylistBlockMobileFirstEntry.qunit.html b/modules/KalturaSupport/tests/AccessControlPlaylistBlockMobileFirstEntry.qunit.html index 48858a7dae..8d7a70825b 100644 --- a/modules/KalturaSupport/tests/AccessControlPlaylistBlockMobileFirstEntry.qunit.html +++ b/modules/KalturaSupport/tests/AccessControlPlaylistBlockMobileFirstEntry.qunit.html @@ -1,7 +1,7 @@ -AccessControl Playlist Block Mobile First Entry test +AccessControl Playlist Block iOS on First Entry test