Merge pull request #32 from jwplayer/develop

Cutting 1.5.5 Release
jwplayer · Jul 21, 2016 · a18209b · a18209b
2 parents cc87c41 + b60e0bc
commit a18209b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/jw-player/include/shortcode.php b/jw-player/include/shortcode.php
@@ -197,16 +197,16 @@ function jwplayer_shortcode_create_js_embed( $media_hash, $player_hash = null, $
 
 	$timeout = intval( get_option( 'jwplayer_timeout' ) );
 	$js_lib = "$protocol://$content_mask/libraries/$player_hash.js";
-	$xml = "$protocol://$content_mask/jw6/$media_hash.xml";
+	$json = "$protocol://$content_mask/feeds/$media_hash.json";
 	if ( $timeout > 0 ) {
 		$api_secret = get_option( 'jwplayer_api_secret' );
 		$expires = time() + 60 * $timeout;
 
 		$js_lib_sig = md5( "libraries/$player_hash.js:" . $expires . ':' . $api_secret );
 		$js_lib = "$js_lib?exp=$expires&sig=$js_lib_sig";
 
-		$xml_sig = md5( "jw6/$media_hash.xml:" . $expires . ':' . $api_secret );
-		$xml = "$xml?exp=$expires&sig=$xml_sig";
+		$json_sig = md5( "feeds/$media_hash.json:" . $expires . ':' . $api_secret );
+		$json = "$json?exp=$expires&sig=$json_sig";
 	}
 
 	$params = jwplayer_shortcode_filter_player_params( $params );
@@ -225,7 +225,7 @@ function jwplayer_shortcode_create_js_embed( $media_hash, $player_hash = null, $
 		}
 	}
 	if ( ! isset( $params['source'] ) ) {
-		$params['playlist'] = $xml;
+		$params['playlist'] = $json;
 	}
 
 	// Set ph value for player hosting source

diff --git a/jw-player/jw-player.php b/jw-player/jw-player.php
@@ -4,7 +4,7 @@
 Plugin URI: http://www.jwplayer.com/
 Description: This plugin allows you to easily upload and embed videos using the JW Player. The embedded video links can be signed, making it harder for viewers to steal your content.
 Author: JW Player
-Version: 1.5.4
+Version: 1.5.5
 */
 
 define( 'JWPLAYER_PLUGIN_DIR', dirname( __FILE__ ) );

diff --git a/jw-player/readme.txt b/jw-player/readme.txt
@@ -3,7 +3,7 @@ Contributors: LongTail Video
 Tags: jwplayer, jw, player, jwplatform, video, media, html5
 Requires at least: 4.3
 Tested up to: 4.5.2
-Stable tag: 1.5.4
+Stable tag: 1.5.5
 License: GPLv3
 
 Upload and embed videos with your JW Player account to seamlessly integrate video into your WordPress website.
@@ -96,6 +96,10 @@ That's great. Tell us about it and open a pull request on [our GitHub mirror of
 
 == Changelog ==
 
+= 1.5.5 =
+
+* Update: Use JSON feeds instead of XML
+
 = 1.5.4 =
 
 * Fix: Uploading files with Unicode names