Ticket #26642: 26642.6.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>';
                 });
         }
@@ -189 +194 @@
 
                         html = createImageAndLink( imageData, 'html' );
 
-                        width = imageData.width + 10;
                         className = 'align' + imageData.align;
 
+                        if ( editor.getParam( 'wpeditimage_no_inline_style_captions' ) ) { 
+                                style = ''; 
+                        } else { 
+                                width = imageData.width + 10; 
+                                style = ' style="width: '+ width +'px"'; 
+                        }
+
                         //TODO: shouldn't add the id attribute if it isn't an attachment
 
                         // should create a new function for generating the caption markup
-                        html =  '<dl id="'+ imageData.attachment_id +'" class="wp-caption '+ className +'" style="width: '+ width +'px">' +
+                        html =  '<dl id="'+ imageData.attachment_id +'" class="wp-caption '+ className +'"'+ style +'>' +
                                 '<dt class="wp-caption-dt">'+ html + '</dt><dd class="wp-caption-dd">'+ imageData.caption +'</dd></dl>';
 
                         node = editor.dom.create( 'div', { 'class': 'mceTemp' }, html );
@@ -475 +486 @@
                                 if ( caption ) {
                                         node = editor.selection.getNode();
 
-                                        if ( data.width ) {
+                                        if ( data.width && ! editor.getParam( 'wpeditimage_no_inline_style_captions' ) ) {
                                                 captionWidth = parseInt( data.width, 10 ) + 10;
                                                 captionWidth = ' style="width: '+ captionWidth +'px"';
                                         }
@@ -539 +550 @@
 
                                                 captionWidth = data.width || imgNode.clientWidth;
 
-                                                if ( captionWidth ) {
+                                                if ( captionWidth && ! editor.getParam( 'wpeditimage_no_inline_style_captions' ) ) {
                                                         captionWidth = parseInt( captionWidth, 10 ) + 10;
                                                         captionWidth = ' style="width: '+ captionWidth +'px"';
                                                 }

tests/phpunit/tests/media.php

@@ -108 +108 @@
                 $this->assertEquals( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
         }
 
+        /**
+         * @ticket 26642
+         */
+        function test_new_img_caption_shortcode_new_format_no_inline() {
+                add_theme_support( 'no-inline-style-captions' );
+                $result = img_caption_shortcode(
+                        array( 'width' => 20 ),
+                        $this->img_content . $this->html_content
+                );
+                $expected = '<div class="wp-caption alignnone">' . $this->img_content . '<p class="wp-caption-text">' . $this->html_content . '</p></div>';
+                $this->assertEquals( $expected, $result );
+                remove_theme_support( 'no-inline-style-captions' );
+        }
+
         function test_add_remove_oembed_provider() {
                 wp_oembed_add_provider( 'http://foo.bar/*', 'http://foo.bar/oembed' );
                 $this->assertTrue( wp_oembed_remove_provider( 'http://foo.bar/*' ) );