Ticket #43123: 43123.diff

src/wp-includes/media.php

@@ -1603 +1603 @@
 
         $style = '';
         if ( $caption_width ) {
-                $style = 'style="max-width: ' . (int) $caption_width . 'px" ';
+                $style = 'style="width: ' . (int) $caption_width . 'px" ';
         }
 
         if ( $html5 ) {

tests/phpunit/tests/media.php

@@ -132 +132 @@
                 $this->assertEquals( 1, preg_match_all( "/{$this->caption}/", $result, $_r ) );
 
                 if ( current_theme_supports( 'html5', 'caption' ) ) {
-                        $this->assertEquals( 1, preg_match_all( '/max-width: 20/', $result, $_r ) );
+                        $this->assertEquals( 1, preg_match_all( '/width: 20/', $result, $_r ) );
                 } else {
-                        $this->assertEquals( 1, preg_match_all( '/max-width: 30/', $result, $_r ) );
+                        $this->assertEquals( 1, preg_match_all( '/width: 30/', $result, $_r ) );
                 }
         }
 

tests/phpunit/tests/shortcode.php

@@ -535 +535 @@
                         ),
                         array(
                                 '[caption caption="test" width="2"]<div>hello</div>[/caption]',
-                                '<div style="max-width: 12px" class="wp-caption alignnone"><div>hello</div><p class="wp-caption-text">test</p></div>',
+                                '<div style="width: 12px" class="wp-caption alignnone"><div>hello</div><p class="wp-caption-text">test</p></div>',
                         ),
                         array(
                                 '<div [gallery]>',