Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-26 06:13:07 +02:00
Code Issues Projects Releases Wiki Activity

Don't force newlines around URLs in WP_Embed::autoembed().

Browse Source 
props chipx86, sgrant.
fixes #23776.
Built from https://develop.svn.wordpress.org/trunk@31066


git-svn-id: http://core.svn.wordpress.org/trunk@31047 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-01-07 07:51:22 +00:00
parent 6299d3f617
commit 7df3885d2e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-wp-embed.php
View File

@ -311,7 +311,7 @@ class WP_Embed {
* @return string Potentially modified $content.
*/
public function autoembed( $content ) {
return preg_replace_callback( '|^\s*(https?://[^\s"]+)\s*$|im', array( $this, 'autoembed_callback' ), $content );
return preg_replace_callback( '|^(\s*)(https?://[^\s"]+)(\s*)$|im', array( $this, 'autoembed_callback' ), $content );
}
/**
@ -323,10 +323,10 @@ class WP_Embed {
public function autoembed_callback( $match ) {
$oldval = $this->linkifunknown;
$this->linkifunknown = false;
$return = $this->shortcode( array(), $match[1] );
$return = $this->shortcode( array(), $match[2] );
$this->linkifunknown = $oldval;
return "\n$return\n";
return $match[1] . $return . $match[3];
}
/**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31065';
$wp_version = '4.2-alpha-31066';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.