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

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

git-svn-id: http://core.svn.wordpress.org/trunk@23087 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2012-12-06 03:36:17 +00:00
parent 8efc323e2e
commit e09094434e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/js/media-editor.js
View File

@ -555,7 +555,8 @@
options = { options = {
id: attachment.id, id: attachment.id,
post_content: attachment.description post_content: attachment.description,
post_excerpt: caption,
}; };
if ( props.linkUrl ) if ( props.linkUrl )
@ -563,7 +564,6 @@
if ( 'image' === attachment.type ) { if ( 'image' === attachment.type ) {
html = wp.media.string.image( props ); html = wp.media.string.image( props );
options.post_excerpt = caption;
_.each({ _.each({
align: 'align', align: 'align',

4
wp-includes/media.php
View File

@ -1751,6 +1751,10 @@ function wp_print_media_templates() {
<# } #> <# } #>
/> />
</label> </label>
<label class="setting" data-setting="caption">
<span><?php _e('Caption'); ?></span>
<textarea {{ maybeReadOnly }}>{{ data.caption }}</textarea>
</label>
<# } #> <# } #>
<label class="setting" data-setting="description"> <label class="setting" data-setting="description">
<span><?php _e('Description'); ?></span> <span><?php _e('Description'); ?></span>