Changeset 23087

Timestamp:

12/06/2012 03:36:17 AM (14 years ago)

Author:

nacin

Message:

Restore captions for non-image attachments. see #22759.

Location:

trunk/wp-includes

Files:

• js/media-editor.js (modified) (2 diffs)
• media.php (modified) (1 diff)

trunk/wp-includes/js/media-editor.js

@@ -556 +556 @@
                                 options = {
                                         id:           attachment.id,
-                                        post_content: attachment.description
+                                        post_content: attachment.description,
+                                        post_excerpt: caption,
                                 };
 
@@ -564 +565 @@
                                 if ( 'image' === attachment.type ) {
                                         html = wp.media.string.image( props );
-                                        options.post_excerpt = caption;
 
                                         _.each({

trunk/wp-includes/media.php

@@ -1752 +1752 @@
                                 />
                         </label>
+                        <label class="setting" data-setting="caption">
+                                <span><?php _e('Caption'); ?></span>
+                                <textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea>
+                        </label>
                 <# } #>
                         <label class="setting" data-setting="description">