Make WordPress Core

Changeset 45213


Ignore:
Timestamp:
04/16/2019 02:55:48 PM (8 years ago)
Author:
desrosj
Message:

Bundled Themes: Use the theme version when enqueuing theme specific stylesheets.

For many bundled theme related stylesheets, a version is either not specified, or specified as a hardcoded date string when enqueued. This is problematic when a stylesheet is updated and the version number is not (which has happened several times recently). This change ensures that all bundled theme related stylesheets use the theme’s version as the stylesheet version. This ensures cache busting for theme stylesheets every time a theme is updated and guarantees that users receive any new or updated styles included in the update when visiting the site for the first time after an update.

Props parsmizban, ianbelanger, dswebsme.
Fixes #39997.

Location:
trunk/src/wp-content/themes
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-content/themes/twentyeleven/functions.php

    r45081 r45213  
    295295function twentyeleven_scripts_styles() {
    296296        // Theme block stylesheet.
    297         wp_enqueue_style( 'twentyeleven-block-style', get_template_directory_uri() . '/blocks.css', array(), '20181230' );
     297        wp_enqueue_style( 'twentyeleven-block-style', get_template_directory_uri() . '/blocks.css', array(), wp_get_theme()->get( 'Version' ) );
    298298}
    299299add_action( 'wp_enqueue_scripts', 'twentyeleven_scripts_styles' );
    … …  
    306306function twentyeleven_block_editor_styles() {
    307307        // Block styles.
    308         wp_enqueue_style( 'twentyeleven-block-editor-style', get_template_directory_uri() . '/editor-blocks.css', array(), '20181230' );
     308        wp_enqueue_style( 'twentyeleven-block-editor-style', get_template_directory_uri() . '/editor-blocks.css', array(), wp_get_theme()->get( 'Version' ) );
    309309}
    310310add_action( 'enqueue_block_editor_assets', 'twentyeleven_block_editor_styles' );
  • trunk/src/wp-content/themes/twentyeleven/header.php

    r45042 r45213  
    4949        </title>
    5050<link rel="profile" href="http://gmpg.org/xfn/11" />
    51 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
     51<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>?ver=<?php echo esc_attr( wp_get_theme()->get( 'Version' ) ); ?>" />
    5252<link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
    5353<!--[if lt IE 9]>
  • trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php

    r45140 r45213  
    1818 */
    1919function twentyeleven_admin_enqueue_scripts( $hook_suffix ) {
    20         wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.css', false, '2011-04-28' );
     20        wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.css', false, wp_get_theme()->get( 'Version' ) );
    2121        wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js', array( 'farbtastic' ), '2011-06-10' );
    2222        wp_enqueue_style( 'farbtastic' );
    … …  
    408408
    409409        if ( 'dark' == $color_scheme ) {
    410                 wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), null );
     410                wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), wp_get_theme()->get( 'Version' ) );
    411411        }
    412412
  • trunk/src/wp-content/themes/twentyfifteen/functions.php

    r45126 r45213  
    368368
    369369        // Load our main stylesheet.
    370         wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri() );
     370        wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );
    371371
    372372        // Theme block stylesheet.
    373         wp_enqueue_style( 'twentyfifteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfifteen-style' ), '20181230' );
     373        wp_enqueue_style( 'twentyfifteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfifteen-style' ), wp_get_theme()->get( 'Version' ) );
    374374
    375375        // Load the Internet Explorer specific stylesheet.
    376         wp_enqueue_style( 'twentyfifteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfifteen-style' ), '20141010' );
     376        wp_enqueue_style( 'twentyfifteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfifteen-style' ), wp_get_theme()->get( 'Version' ) );
    377377        wp_style_add_data( 'twentyfifteen-ie', 'conditional', 'lt IE 9' );
    378378
    379379        // Load the Internet Explorer 7 specific stylesheet.
    380         wp_enqueue_style( 'twentyfifteen-ie7', get_template_directory_uri() . '/css/ie7.css', array( 'twentyfifteen-style' ), '20141010' );
     380        wp_enqueue_style( 'twentyfifteen-ie7', get_template_directory_uri() . '/css/ie7.css', array( 'twentyfifteen-style' ), wp_get_theme()->get( 'Version' ) );
    381381        wp_style_add_data( 'twentyfifteen-ie7', 'conditional', 'lt IE 8' );
    382382
    … …  
    410410function twentyfifteen_block_editor_styles() {
    411411        // Block styles.
    412         wp_enqueue_style( 'twentyfifteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20181230' );
     412        wp_enqueue_style( 'twentyfifteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), wp_get_theme()->get( 'Version' ) );
    413413        // Add custom fonts.
    414414        wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), null );
  • trunk/src/wp-content/themes/twentyfourteen/functions.php

    r45081 r45213  
    317317
    318318        // Load our main stylesheet.
    319         wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri() );
     319        wp_enqueue_style( 'twentyfourteen-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );
    320320
    321321        // Theme block stylesheet.
    322         wp_enqueue_style( 'twentyfourteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfourteen-style' ), '20181230' );
     322        wp_enqueue_style( 'twentyfourteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentyfourteen-style' ), wp_get_theme()->get( 'Version' ) );
    323323
    324324        // Load the Internet Explorer specific stylesheet.
    325         wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), '20131205' );
     325        wp_enqueue_style( 'twentyfourteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfourteen-style' ), wp_get_theme()->get( 'Version' ) );
    326326        wp_style_add_data( 'twentyfourteen-ie', 'conditional', 'lt IE 9' );
    327327
    … …  
    396396function twentyfourteen_block_editor_styles() {
    397397        // Block styles.
    398         wp_enqueue_style( 'twentyfourteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20181230' );
     398        wp_enqueue_style( 'twentyfourteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), wp_get_theme()->get( 'Version' ) );
    399399        // Add custom fonts.
    400400        wp_enqueue_style( 'twentyfourteen-fonts', twentyfourteen_font_url(), array(), null );
  • trunk/src/wp-content/themes/twentyseventeen/functions.php

    r44500 r45213  
    447447
    448448        // Theme stylesheet.
    449         wp_enqueue_style( 'twentyseventeen-style', get_stylesheet_uri() );
     449        wp_enqueue_style( 'twentyseventeen-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );
    450450
    451451        // Theme block stylesheet.
    452         wp_enqueue_style( 'twentyseventeen-block-style', get_theme_file_uri( '/assets/css/blocks.css' ), array( 'twentyseventeen-style' ), '1.1' );
     452        wp_enqueue_style( 'twentyseventeen-block-style', get_theme_file_uri( '/assets/css/blocks.css' ), array( 'twentyseventeen-style' ), wp_get_theme()->get( 'Version' ) );
    453453
    454454        // Load the dark colorscheme.
    455455        if ( 'dark' === get_theme_mod( 'colorscheme', 'light' ) || is_customize_preview() ) {
    456                 wp_enqueue_style( 'twentyseventeen-colors-dark', get_theme_file_uri( '/assets/css/colors-dark.css' ), array( 'twentyseventeen-style' ), '1.0' );
     456                wp_enqueue_style( 'twentyseventeen-colors-dark', get_theme_file_uri( '/assets/css/colors-dark.css' ), array( 'twentyseventeen-style' ), wp_get_theme()->get( 'Version' ) );
    457457        }
    458458
    459459        // Load the Internet Explorer 9 specific stylesheet, to fix display issues in the Customizer.
    460460        if ( is_customize_preview() ) {
    461                 wp_enqueue_style( 'twentyseventeen-ie9', get_theme_file_uri( '/assets/css/ie9.css' ), array( 'twentyseventeen-style' ), '1.0' );
     461                wp_enqueue_style( 'twentyseventeen-ie9', get_theme_file_uri( '/assets/css/ie9.css' ), array( 'twentyseventeen-style' ), wp_get_theme()->get( 'Version' ) );
    462462                wp_style_add_data( 'twentyseventeen-ie9', 'conditional', 'IE 9' );
    463463        }
    464464
    465465        // Load the Internet Explorer 8 specific stylesheet.
    466         wp_enqueue_style( 'twentyseventeen-ie8', get_theme_file_uri( '/assets/css/ie8.css' ), array( 'twentyseventeen-style' ), '1.0' );
     466        wp_enqueue_style( 'twentyseventeen-ie8', get_theme_file_uri( '/assets/css/ie8.css' ), array( 'twentyseventeen-style' ), wp_get_theme()->get( 'Version' ) );
    467467        wp_style_add_data( 'twentyseventeen-ie8', 'conditional', 'lt IE 9' );
    468468
    … …  
    508508function twentyseventeen_block_editor_styles() {
    509509        // Block styles.
    510         wp_enqueue_style( 'twentyseventeen-block-editor-style', get_theme_file_uri( '/assets/css/editor-blocks.css' ), array(), '1.1' );
     510        wp_enqueue_style( 'twentyseventeen-block-editor-style', get_theme_file_uri( '/assets/css/editor-blocks.css' ), array(), wp_get_theme()->get( 'Version' ) );
    511511        // Add custom fonts.
    512512        wp_enqueue_style( 'twentyseventeen-fonts', twentyseventeen_fonts_url(), array(), null );
  • trunk/src/wp-content/themes/twentysixteen/functions.php

    r45126 r45213  
    368368
    369369        // Theme stylesheet.
    370         wp_enqueue_style( 'twentysixteen-style', get_stylesheet_uri() );
     370        wp_enqueue_style( 'twentysixteen-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );
    371371
    372372        // Theme block stylesheet.
    373         wp_enqueue_style( 'twentysixteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentysixteen-style' ), '20181230' );
     373        wp_enqueue_style( 'twentysixteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentysixteen-style' ), wp_get_theme()->get( 'Version' ) );
    374374
    375375        // Load the Internet Explorer specific stylesheet.
    376         wp_enqueue_style( 'twentysixteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentysixteen-style' ), '20160816' );
     376        wp_enqueue_style( 'twentysixteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentysixteen-style' ), wp_get_theme()->get( 'Version' ) );
    377377        wp_style_add_data( 'twentysixteen-ie', 'conditional', 'lt IE 10' );
    378378
    379379        // Load the Internet Explorer 8 specific stylesheet.
    380         wp_enqueue_style( 'twentysixteen-ie8', get_template_directory_uri() . '/css/ie8.css', array( 'twentysixteen-style' ), '20160816' );
     380        wp_enqueue_style( 'twentysixteen-ie8', get_template_directory_uri() . '/css/ie8.css', array( 'twentysixteen-style' ), wp_get_theme()->get( 'Version' ) );
    381381        wp_style_add_data( 'twentysixteen-ie8', 'conditional', 'lt IE 9' );
    382382
    383383        // Load the Internet Explorer 7 specific stylesheet.
    384         wp_enqueue_style( 'twentysixteen-ie7', get_template_directory_uri() . '/css/ie7.css', array( 'twentysixteen-style' ), '20160816' );
     384        wp_enqueue_style( 'twentysixteen-ie7', get_template_directory_uri() . '/css/ie7.css', array( 'twentysixteen-style' ), wp_get_theme()->get( 'Version' ) );
    385385        wp_style_add_data( 'twentysixteen-ie7', 'conditional', 'lt IE 8' );
    386386
    … …  
    419419function twentysixteen_block_editor_styles() {
    420420        // Block styles.
    421         wp_enqueue_style( 'twentysixteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20181230' );
     421        wp_enqueue_style( 'twentysixteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), wp_get_theme()->get( 'Version' ) );
    422422        // Add custom fonts.
    423423        wp_enqueue_style( 'twentysixteen-fonts', twentysixteen_fonts_url(), array(), null );
  • trunk/src/wp-content/themes/twentyten/functions.php

    r45081 r45213  
    704704function twentyten_scripts_styles() {
    705705        // Theme block stylesheet.
    706         wp_enqueue_style( 'twentyten-block-style', get_template_directory_uri() . '/blocks.css', array(), '20181018' );
     706        wp_enqueue_style( 'twentyten-block-style', get_template_directory_uri() . '/blocks.css', array(), wp_get_theme()->get( 'Version' ) );
    707707}
    708708add_action( 'wp_enqueue_scripts', 'twentyten_scripts_styles' );
    … …  
    715715function twentyten_block_editor_styles() {
    716716        // Block styles.
    717         wp_enqueue_style( 'twentyten-block-editor-style', get_template_directory_uri() . '/editor-blocks.css' );
     717        wp_enqueue_style( 'twentyten-block-editor-style', get_template_directory_uri() . '/editor-blocks.css', array(), wp_get_theme()->get( 'Version' ) );
    718718}
    719719add_action( 'enqueue_block_editor_assets', 'twentyten_block_editor_styles' );
  • trunk/src/wp-content/themes/twentyten/header.php

    r45042 r45213  
    3939        </title>
    4040<link rel="profile" href="http://gmpg.org/xfn/11" />
    41 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
     41<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>?ver=<?php echo esc_attr( wp_get_theme()->get( 'Version' ) ); ?>" />
    4242<link rel="pingback" href="<?php echo esc_url( get_bloginfo( 'pingback_url' ) ); ?>">
    4343<?php
  • trunk/src/wp-content/themes/twentythirteen/functions.php

    r45212 r45213  
    282282
    283283        // Loads our main stylesheet.
    284         wp_enqueue_style( 'twentythirteen-style', get_stylesheet_uri(), array(), '2013-07-18' );
     284        wp_enqueue_style( 'twentythirteen-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );
    285285
    286286        // Theme block stylesheet.
    287         wp_enqueue_style( 'twentythirteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentythirteen-style' ), '2018-12-30' );
     287        wp_enqueue_style( 'twentythirteen-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentythirteen-style' ), wp_get_theme()->get( 'Version' ) );
    288288
    289289        // Loads the Internet Explorer specific stylesheet.
    290         wp_enqueue_style( 'twentythirteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentythirteen-style' ), '2013-07-18' );
     290        wp_enqueue_style( 'twentythirteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentythirteen-style' ), wp_get_theme()->get( 'Version' ) );
    291291        wp_style_add_data( 'twentythirteen-ie', 'conditional', 'lt IE 9' );
    292292}
  • trunk/src/wp-content/themes/twentytwelve/functions.php

    r45081 r45213  
    200200
    201201        // Loads our main stylesheet.
    202         wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri() );
     202        wp_enqueue_style( 'twentytwelve-style', get_stylesheet_uri(), array(), wp_get_theme()->get( 'Version' ) );
    203203
    204204        // Theme block stylesheet.
    205         wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), '20181230' );
     205        wp_enqueue_style( 'twentytwelve-block-style', get_template_directory_uri() . '/css/blocks.css', array( 'twentytwelve-style' ), wp_get_theme()->get( 'Version' ) );
    206206
    207207        // Loads the Internet Explorer specific stylesheet.
    208         wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), '20121010' );
     208        wp_enqueue_style( 'twentytwelve-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentytwelve-style' ), wp_get_theme()->get( 'Version' ) );
    209209        $wp_styles->add_data( 'twentytwelve-ie', 'conditional', 'lt IE 9' );
    210210}
    … …  
    218218function twentytwelve_block_editor_styles() {
    219219        // Block styles.
    220         wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20181230' );
     220        wp_enqueue_style( 'twentytwelve-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), wp_get_theme()->get( 'Version' ) );
    221221        // Add custom fonts.
    222222        wp_enqueue_style( 'twentytwelve-fonts', twentytwelve_get_font_url(), array(), null );
Note: See TracChangeset for help on using the changeset viewer.