Changeset 42838

Timestamp:

03/16/2018 08:18:48 PM (7 years ago)

Author:

joemcgill

Message:

Revert max-width styles on caption shortcodes.

This is a partial revert of [41724], so image captions include an
inline width style instead of max-width.

This returns the caption shortcode to the pre-4.9.0 behavior, while
retaining the extra unit test coverage added in [41724].

Fixes #43123. See #33981.

Merges [42837] to the 4.9 branch.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/media.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (1 diff)
• tests/phpunit/tests/shortcode.php (modified) (1 diff)

branches/4.9/src/wp-includes/media.php

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

branches/4.9/tests/phpunit/tests/media.php

@@ -126 +126 @@
 
         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 ) );
         }
     }

branches/4.9/tests/phpunit/tests/shortcode.php

@@ -478 +478 @@
             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(