Changeset 23984

Timestamp:

04/14/2013 01:11:44 AM (12 years ago)

Author:

markjaquith

Message:

Only remove ONE piece of media from the content in setup_postdata().

props wonderboymusic. fixes #24052.

Location:

trunk

Files:

• wp-admin/css/wp-admin.css (modified) (2 diffs)
• wp-includes/media.php (modified) (6 diffs)
• wp-includes/query.php (modified) (1 diff)

trunk/wp-admin/css/wp-admin.css

@@ -3984 +3984 @@
 }
 
-.wp-format-media-holder.empty {
+.wp-format-media-holder.empty,
+.wp-format-audio .wp-format-media-holder,
+.wp-format-video .wp-format-media-holder {
     height: auto;
     padding: 55px 0 20px;
@@ -4013 +4015 @@
 }
 
-.empty .wp-format-media-select {
+.empty .wp-format-media-select,
+.wp-format-audio .wp-format-media-select,
+.wp-format-video .wp-format-media-select {
     height: 20px;
 }

trunk/wp-includes/media.php

@@ -1846 +1846 @@
  * @param boolean $html Whether to return HTML or URLs
  * @param boolean $remove Whether to remove the found URL from the passed content.
+ * @param int $limit Optional. The number of medias to return
  * @return array A list of parsed shortcodes or extracted srcs
  */
-function get_content_media( $type, &$content, $html = true, $remove = false ) {
+function get_content_media( $type, &$content, $html = true, $remove = false, $limit = 0 ) {
     $items = array();
     $matches = array();
@@ -1860 +1861 @@
 
                 $items[] = do_shortcode_tag( $shortcode );
+                if ( $limit > 0 && count( $items ) >= $limit )
+                    break;
             }
         }
@@ -2044 +2047 @@
  * @param string $type Required. 'audio' or 'video'
  * @param WP_Post $post Optional. Used instead of global $post when passed.
+ * @param int $limit Optional. The number of medias to remove if content is scanned.
  * @return string
  */
-function get_the_post_format_media( $type, &$post = null ) {
+function get_the_post_format_media( $type, &$post = null, $limit = 0 ) {
     global $wp_embed;
 
@@ -2091 +2095 @@
     $content = $post->post_content;
 
-    $htmls = get_content_media( $type, $content, true, true );
+    $htmls = get_content_media( $type, $content, true, true, $limit );
     if ( ! empty( $htmls ) ) {
         $html = reset( $htmls );
@@ -2134 +2138 @@
  */
 function the_post_format_video() {
-    echo get_the_post_format_media( 'video' );
+    $null = null;
+    echo get_the_post_format_media( 'video', $null, 1 );
 }
 /**
@@ -2143 +2148 @@
  */
 function the_post_format_audio() {
-    echo get_the_post_format_media( 'audio' );
+    $null = null;
+    echo get_the_post_format_media( 'audio', $null, 1 );
 }
 

trunk/wp-includes/query.php

@@ -3703 +3703 @@
             break;
         case 'audio':
-            get_the_post_format_media( 'audio', $post );
+            get_the_post_format_media( 'audio', $post, 1 );
             if ( isset( $post->split_content ) )
                 $split_content = $post->split_content;
             break;
         case 'video':
-            get_the_post_format_media( 'video', $post );
+            get_the_post_format_media( 'video', $post, 1 );
             if ( isset( $post->split_content ) )
                 $split_content = $post->split_content;