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

Make a copy of post content to avoid changing it in get_the_image(). Remove unnecessary assignment from get_the_media(). props wonderboymusic for initial patch. fixes #23888. 

git-svn-id: http://core.svn.wordpress.org/trunk@23869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2013-03-29 19:10:31 +00:00
parent 969cf51e6f
commit c254787f0c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/media.php
View File

@ -2069,9 +2069,8 @@ function get_the_media( $type, &$post = null ) {
}
}
// these functions expected a reference, not a value
$_content = $post->post_content;
$content =& $_content;
// these functions expect a reference, so we should make a copy of post content to avoid changing it
$content = $post->post_content;
$htmls = get_content_media( $type, $content, true, true );
if ( ! empty( $htmls ) ) {
@ -2386,7 +2385,7 @@ function get_the_image( $attached_size = 'full', &$post = null ) {
$count = 1;
$matches = array();
$content =& $post->post_content;
$content = $post->post_content;
if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER ) && ! empty( $matches ) ) {
foreach ( $matches as $shortcode ) {
@ -2415,7 +2414,7 @@ function get_the_image( $attached_size = 'full', &$post = null ) {
return $post->format_content;
}
$content =& $post->post_content;
$content = $post->post_content;
$htmls = get_content_images( $content, true, true, 1 );
if ( ! empty( $htmls ) ) {
$html = reset( $htmls );