Changeset 23869

Timestamp:

03/29/2013 07:10:31 PM (12 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/wp-includes/media.php (modified) (3 diffs)

trunk/wp-includes/media.php

@@ -2070 +2070 @@
     }
 
-    // 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 );
@@ -2387 +2386 @@
         $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 ) ) {
@@ -2416 +2415 @@
     }
 
-    $content =& $post->post_content;
+    $content = $post->post_content;
     $htmls = get_content_images( $content, true, true, 1 );
     if ( ! empty( $htmls ) ) {