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

After [31620], when checking for HTTP URLs, make sure we are checking the shortcode body instead of an indexed attribute. 

See #31139.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31607 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-03-05 16:26:25 +00:00
parent ae85d506e6
commit da7359b060
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-admin/includes/ajax-actions.php
View File

@ -2711,8 +2711,8 @@ function wp_ajax_parse_embed() {
preg_match( '/' . get_shortcode_regex() . '/s', $shortcode, $matches ); preg_match( '/' . get_shortcode_regex() . '/s', $shortcode, $matches );
$atts = shortcode_parse_atts( $matches[3] ); $atts = shortcode_parse_atts( $matches[3] );
if ( ! empty( $atts[5] ) ) { if ( ! empty( $matches[5] ) ) {
$url = $atts[5]; $url = $matches[5];
} elseif ( ! empty( $atts['src'] ) ) { } elseif ( ! empty( $atts['src'] ) ) {
$url = $atts['src']; $url = $atts['src'];
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31625'; $wp_version = '4.2-alpha-31626';
/** /**
* 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.