Media: Backwards compatibility for the disable_captions filter. see #22186, #21390.

git-svn-id: http://core.svn.wordpress.org/trunk@22761 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/js/media-upload.js

@@ -118,8 +118,6 @@ var tb_position;
 			});
 
 			if ( attachment ) {
-				attachment = attachment.toJSON();
-
 				_.extend( props, {
 					title:   attachment.title || attachment.filename,
 					linkUrl: linkToUrl( props, attachment ),
@@ -153,8 +151,6 @@ var tb_position;
 			});
 
 			if ( attachment ) {
-				attachment = attachment.toJSON();
-
 				classes.push( 'wp-image-' + attachment.id );
 
 				sizes = attachment.sizes;
@@ -397,7 +393,13 @@ var tb_position;
 					// Reset the attachment details.
 					delete details[ attachment.cid ];
 
-					if ( 'image' === attachment.get('type') )
+					attachment = attachment.toJSON();
+
+					// If captions are disabled, clear the caption.
+					if ( ! wp.media.view.settings.captions )
+						delete attachment.caption;
+
+					if ( 'image' === attachment.type )
 						this.insert( wp.media.string.image( detail, attachment ) + ' ' );
 					else
 						this.insert( wp.media.string.link( detail, attachment ) + ' ' );

wp-includes/media.php

@@ -1327,6 +1327,7 @@ function wp_enqueue_media( $args = array() ) {
 		'tabs'      => $tabs,
 		'tabUrl'    => add_query_arg( array( 'chromeless' => true ), admin_url('media-upload.php') ),
 		'mimeTypes' => wp_list_pluck( get_post_mime_types(), 0 ),
+		'captions'  => ! apply_filters( 'disable_captions', '' ),
 	);
 
 	$post = null;
@@ -1691,10 +1692,12 @@ function wp_print_media_templates( $attachment ) {
 			<img src="{{ data.model.url }}" draggable="false" />
 		</div>
 
+		<?php if ( ! apply_filters( 'disable_captions', '' ) ) : ?>
 			<label class="setting caption">
 				<span><?php _e('Caption'); ?></span>
 				<textarea data-setting="caption" />
 			</label>
+		<?php endif; ?>
 
 		<label class="setting alt-text">
 			<span><?php _e('Alt Text'); ?></span>