Ticket #26642: 26642.4.diff

src/wp-includes/class-wp-editor.php

@@ -333 +333 @@
                                         'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform',
 
                                         'wpeditimage_disable_captions' => $no_captions,
+                                        'wpeditimage_no_inline_style_captions' => current_theme_supports( 'no-inline-style-captions' ),
                                         'plugins' => implode( ',', $plugins ),
                                 );
 

src/wp-includes/media.php

@@ -785 +785 @@
         $caption_width = apply_filters( 'img_caption_shortcode_width', $caption_width, $atts, $content );
 
         $style = '';
-        if ( $caption_width )
+        if ( $caption_width && ! current_theme_supports( 'no-inline-style-captions' ) )
                 $style = 'style="width: ' . (int) $caption_width . 'px" ';
 
         $class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );

src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -2 +2 @@
 tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
         function parseShortcode( content ) {
                 return content.replace( /(?:<p>)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g, function( a, b, c ) {
-                        var id, cls, w, cap, img, width,
+                        var id, cls, w, cap, img, width, style,
                                 trim = tinymce.trim;
 
                         id = b.match( /id=['"]([^'"]*)['"] ?/ );
@@ -47 +47 @@
                                 return c;
                         }
 
-                        width = parseInt( w, 10 ) + 10;
+                        if ( editor.getParam( 'wpeditimage_no_inline_style_captions' ) ) { 
+                                style = ''; 
+                        } else { 
+                                width = parseInt( w, 10 ) + 10; 
+                                style = ' style="width: '+ width +'px"'; 
+                        }
 
-                        return '<div class="mceTemp"><dl id="'+ id +'" class="wp-caption '+ cls +'" style="width: '+ width +'px">' +
+                        return '<div class="mceTemp"><dl id="'+ id +'" class="wp-caption '+ cls +'"'+ style +'>' +
                                 '<dt class="wp-caption-dt">'+ img +'</dt><dd class="wp-caption-dd">'+ cap +'</dd></dl></div>';
                 });
         }