WordPress.org

Make WordPress Core

Changeset 42838


Ignore:
Timestamp:
03/16/2018 08:18:48 PM (4 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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/4.9

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

    r42669 r42838  
    15791579    $style = '';
    15801580    if ( $caption_width ) {
    1581         $style = 'style="max-width: ' . (int) $caption_width . 'px" ';
     1581        $style = 'style="width: ' . (int) $caption_width . 'px" ';
    15821582    }
    15831583
  • branches/4.9/tests/phpunit/tests/media.php

    r41964 r42838  
    126126
    127127        if ( current_theme_supports( 'html5', 'caption' ) ) {
    128             $this->assertEquals( 1, preg_match_all( "/max-width: 20/", $result, $_r ) );
     128            $this->assertEquals( 1, preg_match_all( '/width: 20/', $result, $_r ) );
    129129        } else {
    130             $this->assertEquals( 1, preg_match_all( "/max-width: 30/", $result, $_r ) );
     130            $this->assertEquals( 1, preg_match_all( '/width: 30/', $result, $_r ) );
    131131        }
    132132    }
  • branches/4.9/tests/phpunit/tests/shortcode.php

    r41724 r42838  
    478478            array(
    479479                '[caption caption="test" width="2"]<div>hello</div>[/caption]',
    480                 '<div style="max-width: 12px" class="wp-caption alignnone"><div>hello</div><p class="wp-caption-text">test</p></div>',
     480                '<div style="width: 12px" class="wp-caption alignnone"><div>hello</div><p class="wp-caption-text">test</p></div>',
    481481            ),
    482482            array(
Note: See TracChangeset for help on using the changeset viewer.