WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Embeds: Add support for `dai.ly` embeds over HTTPS. 

Fixes #36189

Built from https://develop.svn.wordpress.org/trunk@36951


git-svn-id: http://core.svn.wordpress.org/trunk@36919 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2016-03-10 19:49:27 +00:00
parent ff3babeb53
commit ead41790aa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class-oembed.php
View File

@ -43,7 +43,7 @@ class WP_oEmbed {
'#https://youtu\.be/.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ), '#https://youtu\.be/.*#i' => array( 'http://www.youtube.com/oembed?scheme=https', true ),
'#https?://(.+\.)?vimeo\.com/.*#i' => array( 'http://vimeo.com/api/oembed.{format}', true ), '#https?://(.+\.)?vimeo\.com/.*#i' => array( 'http://vimeo.com/api/oembed.{format}', true ),
'#https?://(www\.)?dailymotion\.com/.*#i' => array( 'https://www.dailymotion.com/services/oembed', true ), '#https?://(www\.)?dailymotion\.com/.*#i' => array( 'https://www.dailymotion.com/services/oembed', true ),
'http://dai.ly/*' => array( 'https://www.dailymotion.com/services/oembed', false ), '#https?://dai.ly/.*#i' => array( 'https://www.dailymotion.com/services/oembed', true ),
'#https?://(www\.)?flickr\.com/.*#i' => array( 'https://www.flickr.com/services/oembed/', true ), '#https?://(www\.)?flickr\.com/.*#i' => array( 'https://www.flickr.com/services/oembed/', true ),
'#https?://flic\.kr/.*#i' => array( 'https://www.flickr.com/services/oembed/', true ), '#https?://flic\.kr/.*#i' => array( 'https://www.flickr.com/services/oembed/', true ),
'#https?://(.+\.)?smugmug\.com/.*#i' => array( 'http://api.smugmug.com/services/oembed/', true ), '#https?://(.+\.)?smugmug\.com/.*#i' => array( 'http://api.smugmug.com/services/oembed/', true ),
@ -120,7 +120,7 @@ class WP_oEmbed {
* | Instagram | instagr.am | Yes | 3.5.0 | * | Instagram | instagr.am | Yes | 3.5.0 |
* | Slideshare | slideshare.net | Yes | 3.5.0 | * | Slideshare | slideshare.net | Yes | 3.5.0 |
* | SoundCloud | soundcloud.com | Yes | 3.5.0 | * | SoundCloud | soundcloud.com | Yes | 3.5.0 |
* | Dailymotion | dai.ly | No | 3.6.0 | * | Dailymotion | dai.ly | Yes | 3.6.0 |
* | Flickr | flic.kr | Yes | 3.6.0 | * | Flickr | flic.kr | Yes | 3.6.0 |
* | Spotify | spotify.com | Yes | 3.6.0 | * | Spotify | spotify.com | Yes | 3.6.0 |
* | Imgur | imgur.com | Yes | 3.9.0 | * | Imgur | imgur.com | Yes | 3.9.0 |

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-beta3-36950'; $wp_version = '4.5-beta3-36951';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.