From a18c1f29a229ee8f26cded2457ad224618de14d8 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Wed, 13 Aug 2014 00:17:16 +0000 Subject: [PATCH] Switch the Polldaddy oEmbed endpoint to HTTPS as it now redirects there. See #28507. Built from https://develop.svn.wordpress.org/trunk@29476 git-svn-id: http://core.svn.wordpress.org/trunk@29254 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-oembed.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/class-oembed.php b/wp-includes/class-oembed.php index 38e5d94c32..b6bfeb75db 100644 --- a/wp-includes/class-oembed.php +++ b/wp-includes/class-oembed.php @@ -47,8 +47,8 @@ class WP_oEmbed { 'http://gi*.photobucket.com/groups/*' => array( 'http://photobucket.com/oembed', false ), '#https?://(www\.)?scribd\.com/doc/.*#i' => array( 'http://www.scribd.com/services/oembed', true ), '#https?://wordpress.tv/.*#i' => array( 'http://wordpress.tv/oembed/', true ), - '#https?://(.+\.)?polldaddy\.com/.*#i' => array( 'http://polldaddy.com/oembed/', true ), - '#https?://poll\.fm/.*#i' => array( 'http://polldaddy.com/oembed/', true ), + '#https?://(.+\.)?polldaddy\.com/.*#i' => array( 'https://polldaddy.com/oembed/', true ), + '#https?://poll\.fm/.*#i' => array( 'https://polldaddy.com/oembed/', true ), '#https?://(www\.)?funnyordie\.com/videos/.*#i' => array( 'http://www.funnyordie.com/oembed', true ), '#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i' => array( 'https://api.twitter.com/1/statuses/oembed.{format}', true ), '#https?://(www\.)?soundcloud\.com/.*#i' => array( 'http://soundcloud.com/oembed', true ), diff --git a/wp-includes/version.php b/wp-includes/version.php index 19e257acff..cc300e16fa 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.0-beta3-20140812'; +$wp_version = '4.0-beta3-20140813'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.