Changeset 22761

Timestamp:

11/21/2012 02:27:22 PM (14 years ago)

Author:

koopersmith

Message:

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

Location:

trunk

Files:

• wp-admin/js/media-upload.js (modified) (3 diffs)
• wp-includes/media.php (modified) (2 diffs)

trunk/wp-admin/js/media-upload.js

@@ -119 +119 @@
 
                         if ( attachment ) {
-                                attachment = attachment.toJSON();
-
                                 _.extend( props, {
                                         title:   attachment.title || attachment.filename,
@@ -154 +152 @@
 
                         if ( attachment ) {
-                                attachment = attachment.toJSON();
-
                                 classes.push( 'wp-image-' + attachment.id );
 
@@ -398 +394 @@
                                         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

trunk/wp-includes/media.php

@@ -1328 +1328 @@
                 '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', '' ),
         );
 
@@ -1692 +1693 @@
                 </div>
 
-                <label class="setting caption">
-                        <span><?php _e('Caption'); ?></span>
-                        <textarea data-setting="caption" />
-                </label>
+                <?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">