From 4f1e0eee5286069470921d0872a2d7a71fb76ce4 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Wed, 11 Mar 2015 01:06:26 +0000 Subject: [PATCH] Allow `https` URLs for Instagram embeds, and switch to `https` for its oEmbed API endpoint. See #28507. Built from https://develop.svn.wordpress.org/trunk@31710 git-svn-id: http://core.svn.wordpress.org/trunk@31691 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-oembed.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php index 68a02fb759..7480d98973 100644 --- a/wp-includes/class-oembed.php +++ b/wp-includes/class-oembed.php @@ -56,7 +56,7 @@ class WP_oEmbed { '#https?://vine.co/v/.*#i' => array( 'https://vine.co/oembed.{format}', true ), '#https?://(www\.)?soundcloud\.com/.*#i' => array( 'http://soundcloud.com/oembed', true ), '#https?://(.+?\.)?slideshare\.net/.*#i' => array( 'https://www.slideshare.net/api/oembed/2', true ), - '#http://instagr(\.am|am\.com)/p/.*#i' => array( 'http://api.instagram.com/oembed', true ), + '#https?://instagr(\.am|am\.com)/p/.*#i' => array( 'https://api.instagram.com/oembed', true ), '#https?://(www\.)?rdio\.com/.*#i' => array( 'http://www.rdio.com/api/oembed/', true ), '#https?://rd\.io/x/.*#i' => array( 'http://www.rdio.com/api/oembed/', true ), '#https?://(open|play)\.spotify\.com/.*#i' => array( 'https://embed.spotify.com/oembed/', true ), diff --git a/wp-includes/version.php b/wp-includes/version.php index 3c954fb155..bbfa652473 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31709'; +$wp_version = '4.2-alpha-31710'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.